Merge pull request #193 from LachlanMcKee/align-dependencies-with-app…

…yx-08-07-23 Aligned dependencies wth Appyx
badoo · Jul 8, 2023 · cb93baf · cb93baf
2 parents 5ef17a3 + 2bd9061
commit cb93baf
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ### Pending changes
 
+([#193](https://github.com/badoo/MVICore/pull/193)):
+Updated Kotlin to 1.8.10
+
 ### 1.4.0
 
 #### Additions

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-kotlinVersion = "1.7.10"
+kotlinVersion = "1.8.10"
 detekt = "1.22.0"
 dependencyAnalysis = "1.19.0"
 
 # Android
-androidLifecycleVersion = "2.5.1"
+androidLifecycleVersion = "2.6.1"
 androidAppCompatVersion = "1.4.1"
 androidMaterialVersion = "1.4.0"
 constraintLayoutVersion = "2.1.0"
@@ -15,7 +15,7 @@ rxKotlinVersion = "2.4.0"
 rxAndroidVersion = "2.1.1"
 
 # DI
-daggerVersion = "2.45"
+daggerVersion = "2.46.1"
 
 # Utils
 debugDrawerVersion = "0.9.0"

diff --git a/mvicore-android/build.gradle.kts b/mvicore-android/build.gradle.kts
@@ -34,6 +34,11 @@ android {
             it.useJUnitPlatform()
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

diff --git a/mvicore-android/src/test/java/com/badoo/mvicore/android/lifecycle/TestLifecycleOwner.kt b/mvicore-android/src/test/java/com/badoo/mvicore/android/lifecycle/TestLifecycleOwner.kt
@@ -13,5 +13,6 @@ class TestLifecycleOwner : LifecycleOwner {
             registry.currentState = value
         }
 
-    override fun getLifecycle(): Lifecycle = registry
+    override val lifecycle: Lifecycle
+        get() = registry
 }
diff --git a/mvicore-debugdrawer/build.gradle.kts b/mvicore-debugdrawer/build.gradle.kts
@@ -27,6 +27,11 @@ android {
             )
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

diff --git a/mvicore-demo/mvicore-demo-app/build.gradle.kts b/mvicore-demo/mvicore-demo-app/build.gradle.kts
@@ -33,6 +33,11 @@ android {
     buildFeatures {
         viewBinding = true
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

diff --git a/mvicore-demo/mvicore-demo-catapi/build.gradle.kts b/mvicore-demo/mvicore-demo-catapi/build.gradle.kts
@@ -25,6 +25,11 @@ android {
             )
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

diff --git a/mvicore-demo/mvicore-demo-feature1/build.gradle.kts b/mvicore-demo/mvicore-demo-feature1/build.gradle.kts
@@ -25,6 +25,11 @@ android {
             )
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

diff --git a/mvicore-demo/mvicore-demo-feature2/build.gradle.kts b/mvicore-demo/mvicore-demo-feature2/build.gradle.kts
@@ -26,6 +26,11 @@ android {
             )
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {