diff --git a/CHANGELOG.md b/CHANGELOG.md index 09208dbf..16de1fa6 100644 --- 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 index 25c12424..c676397f 100644 --- 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 index e64ff7fe..0345e410 100644 --- 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 index dea96915..79def7c4 100644 --- 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 index 148f8f99..e044a95a 100644 --- 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 index 23e5c598..d61f3fff 100644 --- 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 index cf19699d..dfc02e9a 100644 --- 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 index 0cffb3c7..4ada39b1 100644 --- 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 index 5e653eab..117fbeff 100644 --- 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 {