migrate gradle dsl

Author: markusressel

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.android.build.api.dsl.ApplicationExtension
+
 plugins {
     id("mkdocseditor.android.application")
     id("mkdocseditor.android.application.compose")
@@ -8,37 +10,23 @@ plugins {
     id("com.google.devtools.ksp")
 }
 
-android {
+val vName = "0.1.0"
+val vCode = 1
+
+extensions.getByType<ApplicationExtension>().apply {
     namespace = "de.markusressel.mkdocseditor"
 
     defaultConfig {
         applicationId = "de.markusressel.mkdocseditor"
 
-        versionCode = 1
-        versionName = "0.1.0"
-    }
-
-    androidComponents {
-        onVariants { variant ->
-            variant.outputs.forEach { output ->
-                val outputImpl = output as com.android.build.api.variant.impl.VariantOutputImpl
-                outputImpl.outputFileName.set("MkDocsEditor_v${defaultConfig.versionName}_(${defaultConfig.versionCode}).apk")
-            }
-        }
-    }
-
-    kotlin {
-        compilerOptions {
-            freeCompilerArgs.addAll(
-                "-opt-in=kotlin.RequiresOptIn",
-                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-                "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-                "-opt-in=androidx.compose.animation.ExperimentalAnimationApi"
-            )
-        }
+        versionCode = vCode
+        versionName = vName
     }
 }
 
+base {
+    archivesName.set("MkDocsEditor_v${vName}_(${vCode})")
+}
 
 dependencies {
     implementation(project(":data"))

auth/build.gradle.kts

@@ -1,9 +1,11 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     id("mkdocseditor.android.library")
     id("mkdocseditor.android.hilt")
 }
 
-android {
+extensions.getByType<LibraryExtension>().apply {
     namespace = "de.markusressel.mkdocseditor.auth"
 }
 

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

@@ -12,7 +12,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.application")
-                apply("org.jetbrains.kotlin.android")
                 apply("mkdocseditor.android.logging")
             }
 

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

@@ -15,7 +15,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.library")
-                apply("org.jetbrains.kotlin.android")
                 apply("mkdocseditor.android.logging")
             }
 

build-logic/convention/src/main/kotlin/de/markusressel/mkdocseditor/KotlinAndroid.kt

@@ -9,7 +9,6 @@ import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 const val COMPILE_SDK = 36
@@ -19,10 +18,6 @@ internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension) {
     commonExtension.apply {
         compileSdk = COMPILE_SDK
 
-        kotlinExtension.apply {
-            jvmToolchain(21)
-        }
-
         compileOptions.apply {
             // Up to Java 11 APIs are available through desugaring
             // https://developer.android.com/studio/write/java11-minimal-support-table

data/build.gradle.kts

@@ -1,11 +1,13 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     id("mkdocseditor.android.library")
     id("mkdocseditor.android.hilt")
     id(libs.plugins.io.objectbox.get().pluginId)
     id("com.google.devtools.ksp")
 }
 
-android {
+extensions.getByType<LibraryExtension>().apply {
     namespace = "de.markusressel.mkdocseditor.data"
 }
 

rest/build.gradle.kts

@@ -1,10 +1,12 @@
+import com.android.build.api.dsl.LibraryExtension
+
 plugins {
     id("mkdocseditor.android.library")
     id("mkdocseditor.android.hilt")
     id("com.google.devtools.ksp")
 }
 
-android {
+extensions.getByType<LibraryExtension>().apply {
     namespace = "de.markusressel.mkdocsrestclient"
 }