Upgrade Gradle, AGP, and dependencies

Author: Drjacky

.idea/kotlinc.xml

@@ -4,7 +4,7 @@ plugins {
     alias(libs.plugins.app.hilt)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.app.kotlin.serialization)
-    id("kotlin-parcelize")
+    id("org.jetbrains.kotlin.plugin.parcelize")
 }
 
 android {

app/build.gradle.kts

@@ -8,7 +8,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             apply(plugin = "com.android.application")
-            apply(plugin = "org.jetbrains.kotlin.android")
             apply(plugin = "app.android.lint")
 
             extensions.configure<ApplicationExtension> {

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

@@ -10,7 +10,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             apply(plugin = "com.android.library")
-            apply(plugin = "org.jetbrains.kotlin.android")
             apply(plugin = "app.android.lint")
 
             extensions.configure<LibraryExtension> {

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

@@ -5,20 +5,16 @@ import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
 
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    commonExtension: CommonExtension,
 ) {
-    commonExtension.apply {
-        buildFeatures {
-            compose = true
-        }
+    commonExtension.buildFeatures.compose = true
 
-        dependencies {
-            val bom = libs.findLibrary("androidx.compose.bom").get()
-            add("implementation", platform(bom))
-            add("androidTestImplementation", platform(bom))
-            add("implementation", libs.findLibrary("androidx.compose.ui.tooling.preview").get())
-            add("debugImplementation", libs.findLibrary("androidx.compose.ui.tooling").get())
-        }
+    dependencies {
+        val bom = libs.findLibrary("androidx.compose.bom").get()
+        add("implementation", platform(bom))
+        add("androidTestImplementation", platform(bom))
+        add("implementation", libs.findLibrary("androidx.compose.ui.tooling.preview").get())
+        add("debugImplementation", libs.findLibrary("androidx.compose.ui.tooling").get())
     }
 
     extensions.configure<ComposeCompilerGradlePluginExtension> {

build-logic/convention/src/main/kotlin/config/AndroidCompose.kt

@@ -1,10 +1,9 @@
 import com.android.build.api.dsl.CommonExtension
-import com.android.build.api.dsl.ManagedVirtualDevice
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.invoke
 
 internal fun configureGradleManagedDevices(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    commonExtension: CommonExtension,
 ) {
     val pixel6Api31 = DeviceConfig("Pixel 6", 31, "aosp")
     val pixel8Api34 = DeviceConfig("Pixel 8", 34, "google")
@@ -13,11 +12,10 @@ internal fun configureGradleManagedDevices(
     val ciDevices = listOf(pixel6Api31)
 
     commonExtension.testOptions.apply {
-        @Suppress("UnstableApiUsage")
         managedDevices {
-            devices {
+            localDevices {
                 allDevices.forEach { deviceConfig ->
-                    maybeCreate(deviceConfig.taskName, ManagedVirtualDevice::class.java).apply {
+                    maybeCreate(deviceConfig.taskName).apply {
                         device = deviceConfig.device
                         apiLevel = deviceConfig.apiLevel
                         systemImageSource = deviceConfig.systemImageSource
@@ -27,7 +25,7 @@ internal fun configureGradleManagedDevices(
             groups {
                 maybeCreate("ci").apply {
                     ciDevices.forEach { deviceConfig ->
-                        targetDevices.add(devices[deviceConfig.taskName])
+                        targetDevices.add(localDevices[deviceConfig.taskName])
                     }
                 }
             }

build-logic/convention/src/main/kotlin/config/GradleManagedDevices.kt

@@ -4,12 +4,13 @@ import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    commonExtension: CommonExtension,
 ) {
     commonExtension.apply {
         compileSdk = libs.findVersion("compileSdk").get().toString().toInt()
@@ -25,7 +26,7 @@ internal fun Project.configureKotlinAndroid(
         }
     }
 
-    extensions.configure<KotlinAndroidProjectExtension> {
+    tasks.withType<KotlinCompile>().configureEach {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
 

build-logic/convention/src/main/kotlin/config/KotlinAndroid.kt

@@ -1,10 +1,9 @@
-import io.gitlab.arturbosch.detekt.Detekt
-import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
+import dev.detekt.gradle.Detekt
+import dev.detekt.gradle.DetektCreateBaselineTask
 
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
@@ -17,48 +16,38 @@ plugins {
 
 dependencies {
     detektPlugins(libs.detekt.formatting)
-    detektPlugins(libs.detekt.twitter.compose.rules)
-    detektPlugins(libs.detekt.kode.compose.rules)
+    detektPlugins(libs.compose.rules.detekt)
 }
 
 val baselineFile = file("$rootDir/config/detekt/baseline.xml")
 val configFile = file("$rootDir/config/detekt/detekt.yml")
 
 detekt {
-    toolVersion = libs.versions.detekt.get()
-    buildUponDefaultConfig = true
-    baseline = baselineFile
+    toolVersion.set(libs.versions.detekt.get())
+    buildUponDefaultConfig.set(true)
+    baseline.set(baselineFile)
     config.setFrom(configFile)
-    parallel = true
-    reports {
-        html.required.set(true)
-        html.outputLocation.set(file("$projectDir/build/detekt/report.html"))
-        xml.required.set(true)
-        xml.outputLocation.set(file("$projectDir/build/detekt/report.xml"))
-    }
+    parallel.set(true)
+    reportsDir.set(file("$projectDir/build/detekt"))
 }
 
 val detektAll by tasks.registering(Detekt::class) {
     description = "Runs Detekt analysis on the whole project."
-    parallel = true
-    buildUponDefaultConfig = true
+    parallel.set(true)
+    buildUponDefaultConfig.set(true)
     setSource(file(projectDir))
     config.setFrom(configFile)
     include("**/*.kt", "**/*.kts")
     exclude("**/resources/**", "**/build/**")
     baseline.set(baselineFile)
-    reports {
-        xml.required.set(true)
-        html.required.set(true)
-    }
 }
 
 val detektFormat by tasks.registering(Detekt::class) {
     description = "Formats the whole project with Detekt."
-    parallel = true
-    disableDefaultRuleSets = true
-    buildUponDefaultConfig = true
-    autoCorrect = true
+    parallel.set(true)
+    disableDefaultRuleSets.set(true)
+    buildUponDefaultConfig.set(true)
+    autoCorrect.set(true)
     setSource(file(projectDir))
     config.setFrom(configFile)
     include("**/*.kt", "**/*.kts")