feat: kotlin 2.0

Author: FunkyMuse

activity/src/main/java/dev/funkymuse/activity/ActivityUtils.kt

@@ -11,11 +11,12 @@ import android.view.View
 import android.view.WindowManager
 
 
-
-
 fun Activity.enableImmersiveMode() {
     val window = window
-    window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
+    window.setFlags(
+        WindowManager.LayoutParams.FLAG_FULLSCREEN,
+        WindowManager.LayoutParams.FLAG_FULLSCREEN
+    )
     window.decorView.setOnSystemUiVisibilityChangeListener { visibility ->
         if (visibility != 0)
             return@setOnSystemUiVisibilityChangeListener
@@ -82,7 +83,7 @@ var Activity.brightness: Float?
     set(value) {
         val window = this.window
         val layoutParams = window.attributes
-        layoutParams?.screenBrightness = value //0 is turned off, 1 is full brightness
+        layoutParams?.screenBrightness = value ?: 1f //0 is turned off, 1 is full brightness
         window?.attributes = layoutParams
     }
 
@@ -91,28 +92,28 @@ var Activity.brightness: Float?
 fun initStrictMode() {
 
     StrictMode.setThreadPolicy(
-            StrictMode.ThreadPolicy.Builder()
-                    .detectCustomSlowCalls()
-                    .detectNetwork()
-                    .penaltyLog()
-                    .penaltyDeath()
-                    .build()
+        StrictMode.ThreadPolicy.Builder()
+            .detectCustomSlowCalls()
+            .detectNetwork()
+            .penaltyLog()
+            .penaltyDeath()
+            .build()
     )
 
     StrictMode.setVmPolicy(
-            StrictMode.VmPolicy.Builder()
-                    .apply {
-                        if (SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-                            detectLeakedRegistrationObjects()
-                        if (SDK_INT >= Build.VERSION_CODES.M)
-                            detectCleartextNetwork()
-                    }
-                    .detectActivityLeaks()
-                    .detectLeakedClosableObjects()
-                    .detectLeakedSqlLiteObjects()
-                    .penaltyLog()
-                    .penaltyDeath()
-                    .build()
+        StrictMode.VmPolicy.Builder()
+            .apply {
+                if (SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
+                    detectLeakedRegistrationObjects()
+                if (SDK_INT >= Build.VERSION_CODES.M)
+                    detectCleartextNetwork()
+            }
+            .detectActivityLeaks()
+            .detectLeakedClosableObjects()
+            .detectLeakedSqlLiteObjects()
+            .penaltyLog()
+            .penaltyDeath()
+            .build()
     )
 }
 

animations/src/main/java/dev/funkymuse/animations/transition/TransitionExtensions.kt

@@ -133,6 +133,6 @@ inline fun ViewGroup.transitionAuto(builder: AutoTransition.() -> Unit = {}) {
 
 inline fun ViewGroup.transitionDelayed(@TransitionRes id: Int, builder: Transition.() -> Unit = {}) {
     val transition = TransitionInflater.from(context).inflateTransition(id)
-    transition.builder()
+    transition?.builder()
     TransitionManager.beginDelayedTransition(this, transition)
 }

build-logic/convention/src/main/kotlin/AppConventionPlugin.kt

@@ -19,6 +19,7 @@ class AppConventionPlugin : Plugin<Project> {
                 apply(versionCatalog.getPluginId("ksp"))
                 apply(versionCatalog.getPluginId("convention-compose-app"))
                 apply(versionCatalog.getPluginId("spotless"))
+                apply(versionCatalog.getPluginId("compose-compiler"))
             }
             configureKotlinOptions()
             extensions.configure<ApplicationExtension>{

build-logic/convention/src/main/kotlin/LibraryComposeConventionPlugin.kt

@@ -1,12 +1,17 @@
 import com.android.build.gradle.LibraryExtension
 import dev.funkymuse.kahelpers.configureAndroidCompose
+import dev.funkymuse.kahelpers.getPluginId
+import dev.funkymuse.kahelpers.versionCatalog
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
 
 class LibraryComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
+            with(pluginManager) {
+                apply(versionCatalog.getPluginId("compose-compiler"))
+            }
             val extension = extensions.getByType<LibraryExtension>()
             configureAndroidCompose(extension)
         }

build-logic/convention/src/main/kotlin/dev/funkymuse/kahelpers/AndroidCompose.kt

@@ -4,7 +4,6 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
 
 /**
@@ -17,15 +16,13 @@ internal fun Project.configureAndroidCompose(
     commonExtension.apply {
         buildFeatures.compose = true
 
-        composeOptions {
-            kotlinCompilerExtensionVersion = libs.getVersion("composeCompiler")
-        }
+        tasks
+            .withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
+                compilerOptions {
+                    freeCompilerArgs.addAll(buildComposeMetricsParameters())
+                }
 
-        tasks.withType<KotlinCompile> {
-            kotlinOptions {
-                freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()
             }
-        }
         dependencies {
             add(implementation, libs.getBundle("compose"))
             add(implementation, libs.getLibrary("kotlin-immutable-collections"))

build-logic/convention/src/main/kotlin/dev/funkymuse/kahelpers/ProjectExtensions.kt

@@ -33,15 +33,19 @@ fun LibraryExtension.addLibrariesConfig() {
 
 
 fun Project.configureKotlinOptions() {
-    tasks.withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = versionCatalog.getVersion("app-build-kotlinJVMTarget")
-        kotlinOptions.freeCompilerArgs = listOf(
-            "-opt-in=kotlin.RequiresOptIn",
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlinx.coroutines.FlowPreview",
-            "-Xcontext-receivers"
-        )
-    }
+    tasks
+        .withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
+            compilerOptions {
+                freeCompilerArgs.addAll(
+                    listOf(
+                        "-opt-in=kotlin.RequiresOptIn",
+                        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                        "-opt-in=kotlinx.coroutines.FlowPreview",
+                        "-Xcontext-receivers"
+                    )
+                )
+            }
+        }
 }
 
 fun Project.configureJavaCompatibilityCompileOptions(commonExtensions: CommonExtension<*, *, *, *, *, *>) {

build.gradle.kts

@@ -10,6 +10,7 @@ plugins {
     alias(libs.plugins.ksp).apply(false)
     alias(libs.plugins.test).apply(false)
     alias(libs.plugins.spotless).apply(false)
+    alias(libs.plugins.compose.compiler).apply(false)
     alias(libs.plugins.dokka)
 }
 

gradle/libs.versions.toml

@@ -41,7 +41,7 @@ junitVersion = "1.1.5"
 kotlinReflect = "2.0.0"
 material = "1.12.0"
 kotlin = "2.0.0"
-ksp = "1.9.24-1.0.20"
+ksp = "2.0.0-1.0.21"
 kotlin-immutable-collections = "0.3.7"
 #Compose
 composeActivity = "1.9.0"
@@ -137,7 +137,6 @@ rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rx" }
 rxkotlin = { module = "io.reactivex.rxjava3:rxkotlin", version.ref = "rx" }
 kotlin-immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlin-immutable-collections" }
 #Compose
-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "composeMaterial3" }
 compose-material-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
@@ -160,7 +159,6 @@ testImplementation-runtime-jupiter-engine = { module = "org.junit.jupiter:junit-
 compose = [
     "compose-activity",
     "compose-animation",
-    "compose-compiler",
     "compose-foundation",
     "compose-material-icons",
     "compose-material3",
@@ -212,6 +210,7 @@ kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "gradlePlugins-dokka" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 convention-compose-app = { id = "convention.android.compose.app" }
 convention-compose-library = { id = "convention.android.compose.library" }
 convention-moshi = { id = "convention.android.moshi" }