mirror of
https://github.com/NiciDieNase/chaosflix
synced 2024-11-23 04:43:07 +00:00
update versions and release 1.3
This commit is contained in:
parent
9e12fb238c
commit
3115f8aa4c
3 changed files with 13 additions and 21 deletions
11
build.gradle
11
build.gradle
|
@ -1,7 +1,6 @@
|
|||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.1.51'
|
||||
ext.kotlin_version = '1.1.60'
|
||||
repositories {
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
|
@ -10,7 +9,7 @@ buildscript {
|
|||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.0.0'
|
||||
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
||||
|
@ -29,13 +28,13 @@ allprojects {
|
|||
}
|
||||
|
||||
ext{
|
||||
minSDK = 17
|
||||
targetSDK = 26
|
||||
compileSdkVersion = 26
|
||||
buildToolsVersion = "26.0.2"
|
||||
supportLibraryVersion = "26.1.0"
|
||||
constraintLayoutVersion = "1.0.2"
|
||||
archCompVersion = "1.0.0-rc1"
|
||||
minSDK = 22
|
||||
targetSDK = 26
|
||||
archCompVersion = "1.0.0"
|
||||
}
|
||||
|
||||
task clean(type: Delete) {
|
||||
|
|
|
@ -9,11 +9,10 @@ android {
|
|||
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 17
|
||||
// minSdkVersion rootProject.ext.minSDK
|
||||
minSdkVersion rootProject.ext.minSDK
|
||||
targetSdkVersion rootProject.ext.targetSDK
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
versionName "1.3"
|
||||
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
|
||||
|
@ -33,23 +32,20 @@ android {
|
|||
}
|
||||
|
||||
group="de.nicidienase.chaosflix"
|
||||
version="1.3-SNAPSHOT"
|
||||
version="1.3"
|
||||
|
||||
dependencies {
|
||||
api 'com.android.support:appcompat-v7:27.0.0'
|
||||
|
||||
// implementation 'com.android.support:multidex:1.0.2'
|
||||
// api "android.arch.lifecycle:runtime:1.0.3"
|
||||
api 'com.android.support:appcompat-v7:27.0.2'
|
||||
|
||||
api "android.arch.lifecycle:extensions:${rootProject.ext.archCompVersion}"
|
||||
kapt "android.arch.lifecycle:compiler:${rootProject.ext.archCompVersion}"
|
||||
api "android.arch.lifecycle:common-java8:1.0.0-rc1"
|
||||
api "android.arch.lifecycle:common-java8:1.0.0"
|
||||
|
||||
api "android.arch.persistence.room:runtime:${rootProject.ext.archCompVersion}"
|
||||
api "android.arch.persistence.room:rxjava2:${rootProject.ext.archCompVersion}"
|
||||
kapt "android.arch.persistence.room:compiler:${rootProject.ext.archCompVersion}"
|
||||
|
||||
api 'io.reactivex.rxjava2:rxjava:2.1.3'
|
||||
api 'io.reactivex.rxjava2:rxjava:2.1.4'
|
||||
|
||||
api 'com.squareup.retrofit2:retrofit:2.3.0'
|
||||
api 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
|
||||
|
@ -57,10 +53,7 @@ dependencies {
|
|||
|
||||
api 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0'
|
||||
|
||||
// implementation 'joda-time:joda-time:2.9.9'
|
||||
// implementation 'org.joda:joda-convert:1.8'
|
||||
|
||||
testCompile "org.mockito:mockito-core:2.11.0"
|
||||
testImplementation "org.mockito:mockito-core:2.11.0"
|
||||
testImplementation 'junit:junit:4.12'
|
||||
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
|
||||
exclude group: 'com.android.support', module: 'support-annotations'
|
||||
|
|
|
@ -20,7 +20,7 @@ import de.nicidienase.chaosflix.common.entities.userdata.WatchlistItemDao
|
|||
ConferenceGroup::class,
|
||||
PlaybackProgress::class,
|
||||
WatchlistItem::class,
|
||||
OfflineEvent::class), version = 3, exportSchema = false)
|
||||
OfflineEvent::class), version = 4, exportSchema = false)
|
||||
@TypeConverters(Converters::class)
|
||||
abstract class ChaosflixDatabase : RoomDatabase() {
|
||||
abstract fun playbackProgressDao(): PlaybackProgressDao
|
||||
|
|
Loading…
Reference in a new issue