feat(build): built-in kotlin support

app/build.gradle.kts

@@ -6,7 +6,6 @@
  */
 @file:Suppress("UnstableApiUsage", "DEPRECATION")
 
-import com.android.build.gradle.internal.api.ApkVariantOutputImpl
 import com.github.spotbugs.snom.Confidence
 import com.github.spotbugs.snom.Effort
 import com.github.spotbugs.snom.SpotBugsTask
@@ -27,7 +26,6 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.parcelize)
-    alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.spotbugs)
     alias(libs.plugins.detekt)
     // needed to make renovate run without shot, as shot requires Android SDK
@@ -167,12 +165,6 @@ android {
         }
     }
 
-    applicationVariants.configureEach {
-        outputs.configureEach {
-            if (this is ApkVariantOutputImpl) this.outputFileName = "${this.baseName}-${this.versionCode}.apk"
-        }
-    }
-
     testOptions {
         unitTests.isReturnDefaultValues = true
         animationsDisabled = true
@@ -229,7 +221,16 @@ android {
             assets.srcDirs(files("$projectDir/schemas"))
         }
     }
+}
 
+androidComponents {
+    onVariants { variant ->
+        variant.outputs.forEach { output ->
+            if (output is com.android.build.api.variant.impl.VariantOutputImpl) {
+                output.outputFileName.set("${variant.name}-${output.versionCode.orNull}.apk")
+            }
+        }
+    }
 }
 
 ksp.arg("room.schemaLocation", "$projectDir/schemas")

appscan/build.gradle.kts

@@ -8,7 +8,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.jetbrains.kotlin.android)
 }
 
 android {

build.gradle.kts

@@ -7,7 +7,6 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.jetbrains.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.spotless) apply false
     alias(libs.plugins.ksp) apply false

gradle.properties

@@ -22,11 +22,5 @@ org.gradle.configuration-cache=true
 
 org.gradle.workers.max=4
 
-# automatically aded via AGP migration
-# see https://developer.android.com/build/releases/agp-9-0-0-release-notes
-# should be changed with https://github.com/nextcloud/android/issues/15993
-android.builtInKotlin=false
-android.newDsl=false
-
 # Needed for local libs
 # org.gradle.dependency.verification=lenient

gradle/libs.versions.toml

@@ -285,7 +285,6 @@ android-application = { id = "com.android.application", version.ref = "androidPl
 android-library = { id = "com.android.library", version.ref = "androidPluginVersion" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 spotbugs = { id = "com.github.spotbugs", version.ref = "spotbugsGradlePlugin" }
-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }