Merge pull request #845 from splendo/kotlin-2.1

Kotlin 2.1
splendo · Dec 16, 2024 · ee83ceb · ee83ceb
2 parents 997a277 + 14d9d5d
commit ee83ceb
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 14 deletions.
diff --git a/.idea/inspectionProfiles/ktlint.xml b/.idea/inspectionProfiles/ktlint.xml
diff --git a/architecture-compose/api/architecture-compose.api b/architecture-compose/api/architecture-compose.api
@@ -224,15 +224,12 @@ public abstract class com/splendo/kaluga/architecture/compose/navigation/Composa
 
 public final class com/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$ComposableNavigatorKt {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$ComposableNavigatorKt;
-	public static field lambda-1 Lkotlin/jvm/functions/Function4;
 	public fun <init> ()V
 	public final fun getLambda-1$architecture_compose_release ()Lkotlin/jvm/functions/Function4;
 }
 
 public final class com/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$SetupNavHostKt {
 	public static final field INSTANCE Lcom/splendo/kaluga/architecture/compose/navigation/ComposableSingletons$SetupNavHostKt;
-	public static field lambda-1 Lkotlin/jvm/functions/Function2;
-	public static field lambda-2 Lkotlin/jvm/functions/Function2;
 	public fun <init> ()V
 	public final fun getLambda-1$architecture_compose_release ()Lkotlin/jvm/functions/Function2;
 	public final fun getLambda-2$architecture_compose_release ()Lkotlin/jvm/functions/Function2;

diff --git a/...rc/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt b/...rc/main/kotlin/com/splendo/kaluga/architecture/compose/navigation/NavigationExtensions.kt
@@ -6,9 +6,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.splendo.kaluga.architecture.compose.activity
 import com.splendo.kaluga.architecture.lifecycle.ActivityLifecycleSubscribable
 import com.splendo.kaluga.architecture.lifecycle.subscribe

diff --git a/.../src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt b/.../src/main/kotlin/com/splendo/kaluga/architecture/compose/viewModel/ViewModelComposable.kt
@@ -5,13 +5,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.splendo.kaluga.architecture.compose.activity
 import com.splendo.kaluga.architecture.compose.lifecycle.ComposableLifecycleSubscribable
 import com.splendo.kaluga.architecture.compose.lifecycle.composableLifecycleSubscribable

diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@ org.gradle.parallel=true
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.ignoreIncorrectDependencies=true
-kotlin.incremental.native=true
+kotlin.incremental.native=false
 kotlin.mpp.import.enableKgpDependencyResolution=true
 
 #Atomicfu

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
 kaluga = "1.6.0"
 
-androidGradle = "8.7.2"
+androidGradle = "8.7.3"
 androidBuildTools = "34.0.0"
 androidCompileSdk = "35"
 androidMinSdk = "24"
-kotlin = "2.0.21"
-kotlinter = "4.4.1"
+kotlin = "2.1.0"
+kotlinter = "5.0.1"
 kotlinx-kover = "0.8.3"
 dependencycheck = "10.0.3"
 dokka = "1.9.20"
@@ -24,15 +24,15 @@ androidx-activity = "1.9.3"
 androidx-appcompat = "1.7.0"
 androidx-arch-core = "2.2.0"
 androidx-browser = "1.8.0"
-androidx-compose = "1.7.5"
+androidx-compose = "1.7.6"
 androidx-compose-constraintlayout = "1.1.0"
-androidx-compose-ui = "1.7.5"
+androidx-compose-ui = "1.7.6"
 androidx-compose-material = "1.3.1"
 androidx-constraintlayout = "2.2.0"
 androidx-core = "1.15.0"
 androidx-fragment = "1.8.5"
 androidx-lifecycle = "2.8.7"
-androidx-navigation = "2.8.4"
+androidx-navigation = "2.8.5"
 androidx-test = "1.6.1"
 androidx-test-runner = "1.6.2"
 androidx-test-espresso = "3.6.1"

diff --git a/kaluga-library-components/build.gradle.kts b/kaluga-library-components/build.gradle.kts
@@ -49,5 +49,5 @@ dependencies {
 val compileKotlin: KotlinCompile by tasks
 
 compileKotlin.kotlinOptions {
-    languageVersion = "2.0"
+    languageVersion = "2.1"
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -53,7 +53,7 @@ include(":review")
 include(":scientific")
 include(":service")
 include(":system")
-// // Test Utils
+// Test Utils
 include(":test-utils")
 include(":test-utils-base")
 include(":test-utils-alerts")