Update to Kotlin 2.0 (#868)

**Background** Kotlin 2.0 is the next generation of Kotlin language development. The transition to it should be smooth, but we are using compiler plugins and there may be problems because of that More info: square/anvil#733 **Changes** - Update kotlin to 2.0 - Update anvil to 2.5.0-beta09 - Update anvil-utils - Migrate to Kotlin Compose gradle plugin **Test plan** Try to build app --------- Co-authored-by: Ilya Gulya <[email protected]> Co-authored-by: makeevrserg <[email protected]>
flipperdevices · Jul 22, 2024 · cfc3388 · cfc3388
1 parent d02d717
commit cfc3388
Show file tree

Hide file tree

Showing 29 changed files with 138 additions and 139 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 # 1.7.2 - In Progress
 
+- [Refactor] Update to Kotlin 2.0
 - [FIX] Distinct fap items by id in paging sources
 - [FIX] Battery level charge
 - [FIX] Button arrow tint

diff --git a/build-logic/plugins/convention/build.gradle.kts b/build-logic/plugins/convention/build.gradle.kts
@@ -14,6 +14,7 @@ dependencies {
     implementation(libs.square.anvil.gradle)
     implementation(libs.ktorfit.gradle)
     implementation(libs.compose.multiplatform.gradle)
+    implementation(libs.compose.gradle)
     implementation(libs.kotlin.jvm.gradle)
 
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))

diff --git a/...ain/kotlin/com/flipperdevices/buildlogic/plugin/FlipperMultiplatformDependenciesPlugin.kt b/...ain/kotlin/com/flipperdevices/buildlogic/plugin/FlipperMultiplatformDependenciesPlugin.kt
@@ -17,13 +17,13 @@ class FlipperMultiplatformDependenciesPlugin : Plugin<Project> {
             } else {
                 fullSourceSetName
             }
-
-            target.extensions.create(
-                "${noMainSourceSetName}Dependencies",
-                FlipperMultiplatformDependenciesScope::class,
-                target,
-                fullSourceSetName
-            )
+            sourceSet.dependencies {
+                target.extensions.create(
+                    "${noMainSourceSetName}Dependencies",
+                    FlipperMultiplatformDependenciesScope::class,
+                    this
+                )
+            }
         }
     }
 

diff --git a/...main/kotlin/com/flipperdevices/buildlogic/plugin/FlipperMultiplatformDependenciesScope.kt b/...main/kotlin/com/flipperdevices/buildlogic/plugin/FlipperMultiplatformDependenciesScope.kt
@@ -1,14 +1,7 @@
 package com.flipperdevices.buildlogic.plugin
 
-import com.flipperdevices.buildlogic.util.ProjectExt.kotlin
-import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
-import org.jetbrains.kotlin.gradle.plugin.mpp.DefaultKotlinDependencyHandler
 
 open class FlipperMultiplatformDependenciesScope(
-    project: Project,
-    name: String
-) : KotlinDependencyHandler by DefaultKotlinDependencyHandler(
-    parent = project.kotlin.sourceSets.getByName(name),
-    project = project
-)
+    handler: KotlinDependencyHandler
+) : KotlinDependencyHandler by handler
diff --git a/build-logic/plugins/convention/src/main/kotlin/commonAndroid.kt b/build-logic/plugins/convention/src/main/kotlin/commonAndroid.kt
@@ -11,6 +11,7 @@ import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.kotlin.dsl.add
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 private const val SPLASH_SCREEN_ACTIVITY = "com.flipperdevices.singleactivity.impl.SingleActivity"
@@ -101,21 +102,21 @@ private fun BaseExtension.configureCompileOptions() {
 private fun Project.suppressOptIn() {
     tasks.withType<KotlinCompile>()
         .configureEach {
-            kotlinOptions {
-                jvmTarget = "11"
-
-                freeCompilerArgs = freeCompilerArgs + listOf(
-                    "-opt-in=com.google.accompanist.pager.ExperimentalPagerApi",
-                    "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
-                    "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-                    "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
-                    "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                    "-opt-in=com.squareup.anvil.annotations.ExperimentalAnvilApi",
-                    "-opt-in=kotlin.time.ExperimentalTime",
-                    "-opt-in=kotlin.RequiresOptIn",
-                    "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
-                    "-opt-in=com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi", // ktlint-disable max-line-length
-                    "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi"
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_11)
+
+                optIn.addAll(
+                    "com.google.accompanist.pager.ExperimentalPagerApi",
+                    "androidx.compose.ui.ExperimentalComposeUiApi",
+                    "androidx.compose.foundation.ExperimentalFoundationApi",
+                    "kotlinx.serialization.ExperimentalSerializationApi",
+                    "kotlinx.coroutines.ExperimentalCoroutinesApi",
+                    "com.squareup.anvil.annotations.ExperimentalAnvilApi",
+                    "kotlin.time.ExperimentalTime",
+                    "kotlin.RequiresOptIn",
+                    "androidx.compose.animation.ExperimentalAnimationApi",
+                    "com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi", // ktlint-disable max-line-length
+                    "androidx.compose.foundation.layout.ExperimentalLayoutApi"
                 )
             }
         }

diff --git a/build-logic/plugins/convention/src/main/kotlin/flipper.android-app.gradle.kts b/build-logic/plugins/convention/src/main/kotlin/flipper.android-app.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     id("kotlin-android")
     id("io.sentry.android.gradle")
     id("flipper.lint")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 @Suppress("UnstableApiUsage")

diff --git a/build-logic/plugins/convention/src/main/kotlin/flipper.android-compose.gradle.kts b/build-logic/plugins/convention/src/main/kotlin/flipper.android-compose.gradle.kts
@@ -1,14 +1,4 @@
-import com.android.build.gradle.BaseExtension
-
 plugins {
     id("flipper.android-lib")
-}
-
-@Suppress("UnstableApiUsage")
-configure<BaseExtension> {
-    buildFeatures.compose = true
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
+    id("org.jetbrains.kotlin.plugin.compose")
 }
diff --git a/build-logic/plugins/convention/src/main/kotlin/flipper.anvil.gradle.kts b/build-logic/plugins/convention/src/main/kotlin/flipper.anvil.gradle.kts
@@ -3,17 +3,16 @@ plugins {
 }
 
 anvil {
-    generateDaggerFactories.set(true)
+    useKsp(contributesAndFactoryGeneration = true)
+    generateDaggerFactories = true
 }
 
 pluginManager.withPlugin("kotlin-kapt") {
-    anvil {
-        generateDaggerFactories.set(false)
-    }
+    error("Please, use `id(\"flipper.anvil.kapt\")` instead")
 }
 
 dependencies {
     "implementation"(libs.dagger)
     "implementation"(libs.anvil.utils.annotations)
-    "anvil"(libs.anvil.utils.compiler)
+    "ksp"(libs.anvil.utils.compiler)
 }
diff --git a/build-logic/plugins/convention/src/main/kotlin/flipper.anvil.kapt.gradle.kts b/build-logic/plugins/convention/src/main/kotlin/flipper.anvil.kapt.gradle.kts
@@ -0,0 +1,29 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    id("com.squareup.anvil")
+}
+
+tasks.withType<KaptGenerateStubsTask>().configureEach {
+    // TODO necessary until anvil supports something for K2 contribution merging
+    compilerOptions {
+        progressiveMode.set(false)
+        languageVersion.set(KotlinVersion.KOTLIN_1_9)
+    }
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    // TODO necessary until anvil supports something for K2 contribution merging
+    compilerOptions {
+        progressiveMode.set(false)
+        languageVersion.set(KotlinVersion.KOTLIN_1_9)
+    }
+}
+
+dependencies {
+    "implementation"(libs.dagger)
+    "implementation"(libs.anvil.utils.annotations)
+    "anvil"(libs.anvil.utils.compiler)
+}
diff --git a/build-logic/plugins/convention/src/main/kotlin/flipper.multiplatform-compose.gradle.kts b/build-logic/plugins/convention/src/main/kotlin/flipper.multiplatform-compose.gradle.kts
@@ -1,8 +1,10 @@
 import com.android.build.gradle.BaseExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("org.jetbrains.kotlin.multiplatform")
     id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
     id("com.android.library")
     id("flipper.lint")
 }
@@ -13,10 +15,8 @@ configure<BaseExtension> {
 
 kotlin {
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_1_8
         }
     }
     jvm("desktop")

diff --git a/build-logic/plugins/convention/src/main/kotlin/flipper.multiplatform.gradle.kts b/build-logic/plugins/convention/src/main/kotlin/flipper.multiplatform.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.gradle.BaseExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("org.jetbrains.kotlin.multiplatform")
@@ -12,10 +13,8 @@ configure<BaseExtension> {
 
 kotlin {
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_1_8
         }
     }
     jvm("desktop")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,8 +7,9 @@ plugins {
     alias(libs.plugins.square.anvil) apply false
     alias(libs.plugins.protobuf) apply false
     alias(libs.plugins.google.gms) apply false
-    id("flipper.lint")
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.baselineprofile) apply false
+    id("flipper.lint")
+    alias(libs.plugins.compose) apply false
     alias(libs.plugins.buildkonfig) apply false
 }
diff --git a/components/bridge/connection/sample/build.gradle.kts b/components/bridge/connection/sample/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("flipper.android-app")
-    id("flipper.anvil")
+    id("flipper.anvil.kapt")
     id("kotlin-kapt")
     id("kotlinx-serialization")
 }
@@ -9,9 +9,6 @@ android.namespace = "com.flipperdevices.bridge.connection"
 
 android {
     buildFeatures.compose = true
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
 }
 
 android {

diff --git a/.../appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/AppCard.kt b/.../appcard/composable/src/main/java/com/flipperdevices/faphub/appcard/composable/AppCard.kt
@@ -77,7 +77,7 @@ fun AppCard(
 private fun AppCardTop(
     fapItem: FapItemShort?,
     modifier: Modifier = Modifier,
-    installationButton: @Composable (modifier: Modifier) -> Unit
+    installationButton: @Composable (Modifier) -> Unit
 ) {
     Row(
         modifier = modifier
@@ -110,7 +110,7 @@ private fun AppCardTop(
             )
         }
         installationButton(
-            modifier = Modifier
+            Modifier
                 .fillMaxHeight()
                 .padding(vertical = 4.dp)
         )

diff --git a/components/nfceditor/sample/build.gradle.kts b/components/nfceditor/sample/build.gradle.kts
@@ -1,18 +1,11 @@
 plugins {
     id("flipper.android-app")
-    id("flipper.anvil")
+    id("flipper.anvil.kapt")
     id("kotlin-kapt")
 }
 
 android.namespace = "com.flipperdevices.nfceditor.sample"
 
-android {
-    buildFeatures.compose = true
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
-}
-
 android {
     defaultConfig {
         applicationId = "com.flipperdevices.nfceditor.sample"

diff --git a/...pperdevices/remotecontrols/impl/brands/presentation/decompose/BrandsDecomposeComponent.kt b/...pperdevices/remotecontrols/impl/brands/presentation/decompose/BrandsDecomposeComponent.kt
@@ -3,6 +3,7 @@ package com.flipperdevices.remotecontrols.impl.brands.presentation.decompose
 import com.arkivanov.decompose.ComponentContext
 import com.flipperdevices.ifrmvp.backend.model.BrandModel
 import com.flipperdevices.remotecontrols.impl.brands.presentation.util.charSection
+import com.flipperdevices.ui.decompose.DecomposeOnBackParameter
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
@@ -49,7 +50,7 @@ interface BrandsDecomposeComponent {
         fun createBrandsComponent(
             componentContext: ComponentContext,
             categoryId: Long,
-            onBackClicked: () -> Unit,
+            onBackClicked: DecomposeOnBackParameter,
             onBrandClicked: (brandId: Long) -> Unit
         ): BrandsDecomposeComponent
     }

diff --git a/...emotecontrols/impl/brands/presentation/decompose/internal/BrandsDecomposeComponentImpl.kt b/...emotecontrols/impl/brands/presentation/decompose/internal/BrandsDecomposeComponentImpl.kt
@@ -8,6 +8,7 @@ import com.flipperdevices.ifrmvp.backend.model.BrandModel
 import com.flipperdevices.remotecontrols.impl.brands.presentation.decompose.BrandsDecomposeComponent
 import com.flipperdevices.remotecontrols.impl.brands.presentation.viewmodel.BrandsListViewModel
 import com.flipperdevices.remotecontrols.impl.brands.presentation.viewmodel.QueryViewModel
+import com.flipperdevices.ui.decompose.DecomposeOnBackParameter
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.collections.immutable.toImmutableList
@@ -23,7 +24,7 @@ import javax.inject.Provider
 @ContributesAssistedFactory(AppGraph::class, BrandsDecomposeComponent.Factory::class)
 class BrandsDecomposeComponentImpl @AssistedInject constructor(
     @Assisted componentContext: ComponentContext,
-    @Assisted private val onBackClicked: () -> Unit,
+    @Assisted private val onBackClicked: DecomposeOnBackParameter,
     @Assisted private val onBrandClicked: (brandId: Long) -> Unit,
     @Assisted categoryId: Long,
     createBrandsListViewModel: BrandsListViewModel.Factory,

diff --git a/...evices/remotecontrols/impl/categories/presentation/decompose/DeviceCategoriesComponent.kt b/...evices/remotecontrols/impl/categories/presentation/decompose/DeviceCategoriesComponent.kt
@@ -2,6 +2,7 @@ package com.flipperdevices.remotecontrols.impl.categories.presentation.decompose
 
 import com.arkivanov.decompose.ComponentContext
 import com.flipperdevices.ifrmvp.backend.model.DeviceCategory
+import com.flipperdevices.ui.decompose.DecomposeOnBackParameter
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.StateFlow
 
@@ -23,7 +24,7 @@ interface DeviceCategoriesComponent {
     fun interface Factory {
         fun invoke(
             componentContext: ComponentContext,
-            onBackClicked: () -> Unit,
+            onBackClicked: DecomposeOnBackParameter,
             onCategoryClicked: (categoryId: Long) -> Unit
         ): DeviceCategoriesComponent
     }

diff --git a/...controls/impl/categories/presentation/decompose/internal/DeviceCategoriesComponentImpl.kt b/...controls/impl/categories/presentation/decompose/internal/DeviceCategoriesComponentImpl.kt
@@ -6,6 +6,7 @@ import com.flipperdevices.core.di.AppGraph
 import com.flipperdevices.ifrmvp.backend.model.DeviceCategory
 import com.flipperdevices.remotecontrols.impl.categories.presentation.decompose.DeviceCategoriesComponent
 import com.flipperdevices.remotecontrols.impl.categories.presentation.viewmodel.DeviceCategoryListViewModel
+import com.flipperdevices.ui.decompose.DecomposeOnBackParameter
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import me.gulya.anvil.assisted.ContributesAssistedFactory
@@ -14,7 +15,7 @@ import javax.inject.Provider
 @ContributesAssistedFactory(AppGraph::class, DeviceCategoriesComponent.Factory::class)
 class DeviceCategoriesComponentImpl @AssistedInject constructor(
     @Assisted componentContext: ComponentContext,
-    @Assisted private val onBackClicked: () -> Unit,
+    @Assisted private val onBackClicked: DecomposeOnBackParameter,
     @Assisted private val onCategoryClicked: (categoryId: Long) -> Unit,
     createDeviceCategoryListViewModel: Provider<DeviceCategoryListViewModel>,
 ) : DeviceCategoriesComponent,
@@ -26,7 +27,7 @@ class DeviceCategoriesComponentImpl @AssistedInject constructor(
     override val model = deviceCategoryListFeature.model
 
     override fun onCategoryClicked(category: DeviceCategory) {
-        onCategoryClicked.invoke(category.id)
+        onCategoryClicked(category.id)
     }
 
     override fun onBackClicked() = onBackClicked.invoke()

diff --git a/...lin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/SetupComponent.kt b/...lin/com/flipperdevices/remotecontrols/impl/setup/presentation/decompose/SetupComponent.kt
@@ -4,6 +4,7 @@ import com.arkivanov.decompose.ComponentContext
 import com.flipperdevices.ifrmvp.backend.model.IfrFileModel
 import com.flipperdevices.ifrmvp.backend.model.SignalResponseModel
 import com.flipperdevices.remotecontrols.api.SetupScreenDecomposeComponent
+import com.flipperdevices.ui.decompose.DecomposeOnBackParameter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
@@ -42,7 +43,7 @@ interface SetupComponent {
         fun createSetupComponent(
             componentContext: ComponentContext,
             param: SetupScreenDecomposeComponent.Param,
-            onBack: () -> Unit,
+            onBack: DecomposeOnBackParameter,
             onIfrFileFound: (ifrFileId: Long) -> Unit
         ): SetupComponent
     }

diff --git a/...erdevices/remotecontrols/impl/setup/presentation/decompose/internal/SetupComponentImpl.kt b/...erdevices/remotecontrols/impl/setup/presentation/decompose/internal/SetupComponentImpl.kt
@@ -15,6 +15,7 @@ import com.flipperdevices.remotecontrols.impl.setup.presentation.decompose.Setup
 import com.flipperdevices.remotecontrols.impl.setup.presentation.decompose.internal.mapping.toFFFormat
 import com.flipperdevices.remotecontrols.impl.setup.presentation.viewmodel.CurrentSignalViewModel
 import com.flipperdevices.remotecontrols.impl.setup.presentation.viewmodel.HistoryViewModel
+import com.flipperdevices.ui.decompose.DecomposeOnBackParameter
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.CoroutineScope
@@ -33,7 +34,7 @@ import javax.inject.Provider
 class SetupComponentImpl @AssistedInject constructor(
     @Assisted componentContext: ComponentContext,
     @Assisted override val param: SetupScreenDecomposeComponent.Param,
-    @Assisted private val onBackClicked: () -> Unit,
+    @Assisted private val onBackClicked: DecomposeOnBackParameter,
     @Assisted private val onIfrFileFound: (ifrFileId: Long) -> Unit,
     currentSignalViewModelFactory: CurrentSignalViewModel.Factory,
     createHistoryViewModel: Provider<HistoryViewModel>,