Upgrade dependencies

Author: Adrián García

app/build.gradle

@@ -1,9 +1,7 @@
 buildscript {
     ext {
-        kotlinx_coroutines_version = "0.13"
         spek_version = '1.1.0'
         dagger_version = "2.15"
-        rx_version = "2.0.3"
         rx_android_version = "2.0.2"
         leak_canary_version = "1.5"
         butterkinfe_version = "8.4.0"

build.gradle

@@ -3,15 +3,15 @@ apply plugin: 'com.gladed.androidgitversion'
 
 buildscript {
     ext {
-        kotlin_version = "1.3.50"
+        kotlin_version = "1.3.61"
 
         android_compile_sdk = 29
         android_target_sdk = 29
         android_build_tools_version = "29.0.1"
 
-        lifecycle_version = "2.1.0"
+        lifecycle_version = "2.2.0"
         rx_version = "2.2.6"
-        coroutines_version = "1.3.2"
+        coroutines_version = "1.3.3"
     }
 
     repositories {
@@ -22,11 +22,11 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:3.5.0"
+        classpath "com.android.tools.build:gradle:3.5.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
-        classpath "com.gladed.androidgitversion:gradle-android-git-version:0.4.10"
+        classpath "com.gladed.androidgitversion:gradle-android-git-version:0.4.11"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
     }
 }

gradle.properties

@@ -7,7 +7,6 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-kotlin.coroutines=enable
 android.useAndroidX=true
 android.enableJetifier=true
 # When configured, Gradle will run in incubating parallel mode.

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

mini-android/build.gradle

@@ -26,7 +26,7 @@ dependencies {
 
     api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     api "androidx.appcompat:appcompat:1.1.0"
-    api "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha05"
+    api "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
 
     testImplementation "junit:junit:4.12"
     androidTestImplementation "androidx.test:runner:1.2.0"

mini-kodein-android/build.gradle

@@ -19,6 +19,14 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

mini-kodein-android/src/main/java/mini/kodein/android/KodeinAndroidUtils.kt

@@ -5,7 +5,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import org.kodein.di.DKodein
 import org.kodein.di.Kodein
 import org.kodein.di.KodeinAware
@@ -36,7 +35,7 @@ inline fun <reified VM : ViewModel, reified F : ViewModelProvider.Factory> Kodei
  *
  * Optionally you can decide if you want all instances to be force-provided by module bindings or
  * if you allow creating new instances of them via [Class.newInstance] with [allowNewInstance].
- * The default is true to mimic the default behaviour of [ViewModelProviders.of].
+ * The default is true to mimic the default behaviour of [ViewModelProvider].
  */
 class KodeinViewModelFactory(private val injector: DKodein,
                              private val allowNewInstance: Boolean = true) : ViewModelProvider.Factory {
@@ -57,7 +56,7 @@ class KodeinViewModelFactory(private val injector: DKodein,
 @MainThread
 inline fun <reified VM : ViewModel, A> A.viewModel(): Lazy<VM> where A : KodeinAware, A : FragmentActivity {
     return lazy {
-        ViewModelProviders.of(this, direct.instance()).get(VM::class.java)
+        ViewModelProvider(this, direct.instance()).get(VM::class.java)
     }
 }
 
@@ -67,7 +66,7 @@ inline fun <reified VM : ViewModel, A> A.viewModel(): Lazy<VM> where A : KodeinA
 @MainThread
 inline fun <reified VM : ViewModel, F> F.viewModel(): Lazy<VM> where F : KodeinAware, F : Fragment {
     return lazy {
-        ViewModelProviders.of(this, direct.instance()).get(VM::class.java)
+        ViewModelProvider(this, direct.instance()).get(VM::class.java)
     }
 }
 
@@ -80,7 +79,7 @@ inline fun <reified VM : ViewModel, F> F.viewModel(): Lazy<VM> where F : KodeinA
 @MainThread
 inline fun <reified T, reified VM : TypedViewModel<T>, A> A.viewModel(params: T): Lazy<VM> where A : KodeinAware, A : FragmentActivity {
     return lazy {
-        ViewModelProviders.of(this, direct.instance(VM::class.java, params)).get(VM::class.java)
+        ViewModelProvider(this, direct.instance(VM::class.java, params)).get(VM::class.java)
     }
 }
 
@@ -93,7 +92,7 @@ inline fun <reified T, reified VM : TypedViewModel<T>, A> A.viewModel(params: T)
 @MainThread
 inline fun <reified T, reified VM : TypedViewModel<T>, F> F.viewModel(params: T): Lazy<VM> where F : KodeinAware, F : Fragment {
     return lazy {
-        ViewModelProviders.of(this, direct.instance(VM::class.java, params)).get(VM::class.java)
+        ViewModelProvider(this, direct.instance(VM::class.java, params)).get(VM::class.java)
     }
 }
 
@@ -104,7 +103,7 @@ inline fun <reified T, reified VM : TypedViewModel<T>, F> F.viewModel(params: T)
 @MainThread
 inline fun <reified VM : ViewModel, F> F.sharedActivityViewModel(): Lazy<VM> where F : KodeinAware, F : Fragment {
     return lazy {
-        ViewModelProviders.of(this.requireActivity(), direct.instance()).get(VM::class.java)
+        ViewModelProvider(this.requireActivity(), direct.instance()).get(VM::class.java)
     }
 }
 
@@ -118,7 +117,7 @@ inline fun <reified VM : ViewModel, F> F.sharedActivityViewModel(): Lazy<VM> whe
 @MainThread
 inline fun <reified T, reified VM : TypedViewModel<T>, F> F.sharedActivityViewModel(params: T): Lazy<VM> where F : KodeinAware, F : Fragment {
     return lazy {
-        ViewModelProviders.of(this.requireActivity(), direct.instance(VM::class.java, params)).get(VM::class.java)
+        ViewModelProvider(this.requireActivity(), direct.instance(VM::class.java, params)).get(VM::class.java)
     }
 }
 

mini-kodein/build.gradle

@@ -2,12 +2,19 @@ apply plugin: 'kotlin'
 apply plugin: 'java-library'
 apply from: "../jitpack.gradle"
 
+// Needed because of the Kodein dependency.
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
 dependencies {
     api project(":mini-common")
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
-    def kodein_version = "6.3.3"
+    def kodein_version = "6.5.0"
     api "org.kodein.di:kodein-di-generic-jvm:$kodein_version"
     api "org.kodein.di:kodein-di-framework-android-x:$kodein_version"
 }