Upgrade Kotlin

Upgrade Kotlin to the latest stable version. Upgrade other dependencies like AGP at the same time.

Author: vRallev

docs/di.md

@@ -567,12 +567,6 @@ and generated wrong code. This ticket is [metro/997](https://github.com/ZacSweer
 
 Other IC issues are reported under [KT-75865](https://youtrack.jetbrains.com/issue/KT-75865).
 
-#### `exclude` / `replaces` not support
-
-`kotlin-inject-anvil` allows you to exclude and replace contribution that use custom annotations like 
-`@ContributesRenderer`. Metro is missing this feature and the generated files have to be referenced instead. The 
-ticket is [metro/1020](https://github.com/ZacSweers/metro/issues/1020).
-
 #### Missing integrations
 
 Almost all App Platform specific custom extensions for `kotlin-inject-anvil` were migrated to Metro, including

gradle.properties

@@ -13,7 +13,8 @@ kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.distribution.downloadFromMaven=true
-kotlin.native.enableKlibsCrossCompilation=true
+# There are sometimes build errors and the error suggests to enable this flag.
+kotlin.native.cacheKind.iosSimulatorArm64=none
 
 ksp.useKSP2=true
 

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.12.0"
+agp = "8.13.0"
 android-compileSdk = "36"
 # https://developer.android.com/jetpack/androidx/releases/compose-ui
 # https://maven.google.com/web/index.html#androidx.compose.ui:ui
@@ -35,7 +35,7 @@ detekt = "1.23.8"
 graphviz-java = "0.18.1"
 jvm-compatibility = "11"
 jvm-gradle = "17"
-kotlin = "2.2.10"
+kotlin = "2.2.20"
 kotlin-atomicfu = "0.29.0"
 kotlin-compile-testing = "0.8.0"
 kotlin-hierarchy = "1.1"
@@ -44,9 +44,9 @@ kotlin-inject-anvil = "0.1.6"
 kotlin-poet = "2.2.0"
 kotlinx-binaryCompatibilityValidator = "0.18.1"
 ktfmt-gradle = "0.23.0"
-ksp = "2.2.10-2.0.2"
+ksp = "2.2.20-2.0.2"
 maven-publish = "0.34.0"
-metro = "0.6.5"
+metro = "0.6.6"
 molecule = "2.1.0"
 navigation3 = "1.0.0-alpha06"
 #noinspection GradleDependency

kotlin-inject/public/src/commonMain/kotlin/software/amazon/app/platform/scope/di/ComponentService.kt

@@ -30,14 +30,7 @@ public inline fun <reified T : Any> Scope.diComponent(): T = kotlinInjectCompone
  */
 public inline fun <reified T : Any> Scope.kotlinInjectComponent(): T {
   parents(includeSelf = true)
-    .firstNotNullOfOrNull { scope ->
-      val component = scope.getService<T>(DI_COMPONENT_KEY)
-      if (T::class.isInstance(component)) {
-        component
-      } else {
-        null
-      }
-    }
+    .firstNotNullOfOrNull { scope -> scope.getService<Any>(DI_COMPONENT_KEY) as? T }
     ?.let {
       return it
     }