Merge pull request #7 from kalinjul/update-agp

kalinjul · web-flow · commit 6a0826a4ff69 · 2026-03-11T17:51:01.000+01:00
Update agp
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 .idea
 .kotlin
 .gradle
-.DS_Store
+.DS_Store
+**/DerivedData
diff --git a/README.md b/README.md
@@ -22,13 +22,13 @@ Supported Compose versions:
 
 Add the dependency to your commonMain sourceSet (KMP) / Android dependencies (android only):
 ```kotlin
-implementation("io.github.kalinjul.easydocumentscan:documentscanner-compose:0.4.0")
+implementation("io.github.kalinjul.easydocumentscan:documentscanner-compose:0.4.1")
 ```
 
 Or, for your libs.versions.toml:
 ```toml
 [versions]
-easydocumentscanner = "0.4.0"
+easydocumentscanner = "0.4.1"
 [libraries]
 easydocumentscanner-compose = { module = "io.github.kalinjul.easydocumentscan:documentscanner-compose", version.ref = "easydocumentscanner" }
 easydocumentscanner-core = { module = "io.github.kalinjul.easydocumentscan:documentscanner-core", version.ref = "easydocumentscanner" }
diff --git a/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/AndroidApplicationConventionPlugin.kt
@@ -5,6 +5,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import io.github.kalinjul.convention.config.configureKotlinAndroid
+import org.gradle.api.JavaVersion
 
 class AndroidApplicationConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -15,6 +16,21 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
 
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
+
+                defaultConfig {
+                    targetSdk = libs.versions.targetSdk.get().toInt()
+                    compileSdk = libs.versions.compileSdk.get().toInt()
+                    minSdk = libs.versions.minSdk.get().toInt()
+                    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                }
+
+
+                // Can remove this once https://issuetracker.google.com/issues/260059413 is fixed.
+                // See https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
+                compileOptions {
+                    sourceCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
+                    targetCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
+                }
             }
         }
     }
diff --git a/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/AndroidLibraryConventionPlugin.kt
@@ -1,21 +1,35 @@
 package io.github.kalinjul.convention
 
-import com.android.build.gradle.LibraryExtension
+import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget
 import io.github.kalinjul.convention.config.configureKotlinAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 class AndroidLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
-                apply("com.android.library")
+                apply("com.android.kotlin.multiplatform.library")
             }
 
-            extensions.configure<LibraryExtension> {
-                configureKotlinAndroid(this)
-                namespace = "org.publicvalue.multiplatform.${project.name.replace("-", ".")}"
+            extensions.configure<KotlinMultiplatformExtension> {
+                targets.withType<KotlinMultiplatformAndroidLibraryTarget>().configureEach {
+                    configureKotlinAndroid(this)
+
+                    minSdk = libs.versions.minSdk.get().toInt()
+                    compileSdk = libs.versions.compileSdk.get().toInt()
+
+
+                    optimization {
+                        consumerKeepRules.file(target.layout.projectDirectory.file("consumer-rules.pro").asFile)
+                        consumerKeepRules.publish = true
+                    }
+
+                    namespace = "org.publicvalue.multiplatform.${project.name.replace("-", ".")}"
+                }
             }
         }
     }
diff --git a/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/KotlinMultiplatformConventionPlugin.kt b/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/KotlinMultiplatformConventionPlugin.kt
@@ -2,7 +2,6 @@ package io.github.kalinjul.convention
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
@@ -48,3 +47,5 @@ private fun Project.addKspDependencyForAllTargets(
             }
     }
 }
+
+fun String.capitalized() = replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
diff --git a/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/KotlinMultiplatformMobileConventionPlugin.kt b/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/KotlinMultiplatformMobileConventionPlugin.kt
@@ -20,7 +20,7 @@ class KotlinMultiplatformMobileConventionPlugin : Plugin<Project> {
             extensions.configure<KotlinMultiplatformExtension> {
                 applyDefaultHierarchyTemplate()
 
-                if (pluginManager.hasPlugin("com.android.library")) {
+                if (pluginManager.hasPlugin("com.android.kotlin.multiplatform.library")) {
                     androidTarget {
                         compilerOptions {
                             jvmTarget.set(JvmTarget.fromTarget((libs.versions.jvmTarget.get())))
diff --git a/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/config/Android.kt b/build-logic/convention/src/main/kotlin/io/github/kalinjul/convention/config/Android.kt
@@ -2,36 +2,58 @@ package io.github.kalinjul.convention.config
 
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.KotlinMultiplatformAndroidLibraryTarget
 import com.android.build.api.dsl.LibraryExtension
+import io.github.kalinjul.convention.libs
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.the
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.File
 
-fun Project.configureKotlinAndroid(extension: CommonExtension<*, *, *, *, *, *>) {
-    val libs = the<LibrariesForLibs>()
+//fun Project.configureKotlinAndroid(extension: CommonExtension<*, *, *, *, *, *>) {
+//    val libs = the<LibrariesForLibs>()
+//
+//    if (extension is LibraryExtension) {
+//        extension.defaultConfig {
+//            consumerProguardFiles += File("consumer-rules.pro")
+//        }
+//    } else if (extension is ApplicationExtension) {
+//        extension.apply {
+//            defaultConfig {
+//                targetSdk = libs.versions.targetSdk.get().toInt()
+//            }
+//        }
+//    }
+//
+//    extension.apply {
+//        compileSdk = libs.versions.compileSdk.get().toInt()
+//
+//        defaultConfig {
+//            minSdk = libs.versions.minSdk.get().toInt()
+//            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+//        }
+//
+//        // Can remove this once https://issuetracker.google.com/issues/260059413 is fixed.
+//        // See https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
+//        compileOptions {
+//            sourceCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
+//            targetCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
+//        }
+//    }
+//}
 
-    if (extension is LibraryExtension) {
-        extension.defaultConfig {
-            consumerProguardFiles += File("consumer-rules.pro")
-        }
-    } else if (extension is ApplicationExtension) {
-        extension.apply {
-            defaultConfig {
-                targetSdk = libs.versions.targetSdk.get().toInt()
-            }
+fun Project.configureKotlinAndroid(target: KotlinMultiplatformAndroidLibraryTarget) {
+    target.apply {
+        compilerOptions {
+            this.jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
         }
     }
+}
 
+fun Project.configureKotlinAndroid(extension: ApplicationExtension) {
     extension.apply {
-        compileSdk = libs.versions.compileSdk.get().toInt()
-
-        defaultConfig {
-            minSdk = libs.versions.minSdk.get().toInt()
-            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        }
-
         // Can remove this once https://issuetracker.google.com/issues/260059413 is fixed.
         // See https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
         compileOptions {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import java.net.URI
 
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.multiplatform.library) apply false
     alias(libs.plugins.composeMultiplatform) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.ksp) apply false
diff --git a/documentscanner-compose/build.gradle.kts b/documentscanner-compose/build.gradle.kts
@@ -4,8 +4,8 @@ import io.github.kalinjul.convention.config.configureIosTargets
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
-    id("io.github.kalinjul.convention.android.library")
     id("io.github.kalinjul.convention.kotlin.multiplatform.mobile")
+    id("io.github.kalinjul.convention.android.library")
     id("io.github.kalinjul.convention.centralPublish")
     id("io.github.kalinjul.convention.compose.multiplatform")
 }
diff --git a/documentscanner-compose/consumer-rules.pro b/documentscanner-compose/consumer-rules.pro
@@ -0,0 +1,3 @@
+-keep class * implements com.google.firebase.components.ComponentRegistrar {
+    public <init>();
+}
diff --git a/documentscanner-core/build.gradle.kts b/documentscanner-core/build.gradle.kts
@@ -4,8 +4,8 @@ import io.github.kalinjul.convention.config.configureIosTargets
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
-    id("io.github.kalinjul.convention.android.library")
     id("io.github.kalinjul.convention.kotlin.multiplatform.mobile")
+    id("io.github.kalinjul.convention.android.library")
     id("io.github.kalinjul.convention.centralPublish")
     id("io.github.kalinjul.convention.compose.multiplatform")
 }
@@ -22,15 +22,12 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(compose.runtime)
-                implementation(compose.foundation)
-//                implementation(compose.material3)
+                implementation(libs.compose.foundation)
             }
         }
 
         androidMain {
             dependencies {
-                implementation(libs.mlkit.documentscanner)
                 implementation(libs.androidx.activity.compose)
             }
         }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,10 +5,11 @@ minSdk = "24" # required for exif interface
 
 jvmTarget = "17"
 # https://developer.android.com/build/releases/gradle-plugin#compatibility
-agp = "8.13.0"
+agp = "9.0.1"
 
 #https://github.com/JetBrains/compose-multiplatform
 compose-multiplatform = "1.10.1"
+material3 = "1.10.0-alpha05"
 #https://kotlinlang.org/docs/multiplatform-compatibility-guide.html
 kotlin = "2.2.21"
 # https://github.com/google/ksp
@@ -33,6 +34,8 @@ mlkit-documentscanner = { module = "com.google.android.gms:play-services-mlkit-d
 # compose
 compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-multiplatform" }
 compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose-multiplatform" }
+compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" }
+
 
 # Build logic dependencies
 android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
@@ -43,7 +46,7 @@ dokka-gradlePlugin = { module = "org.jetbrains.dokka:org.jetbrains.dokka.gradle.
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-android-library = { id = "com.android.library", version.ref = "agp" }
+android-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Aug 05 09:58:17 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sample-app/android-app/build.gradle.kts b/sample-app/android-app/build.gradle.kts
@@ -1,24 +1,8 @@
 plugins {
     id("io.github.kalinjul.convention.android.application")
-    id("io.github.kalinjul.convention.kotlin.multiplatform.mobile")
     id("io.github.kalinjul.convention.compose.multiplatform")
 }
 
-kotlin {
-    androidTarget()
-    sourceSets {
-        androidMain {
-            dependencies {
-                implementation(libs.androidx.activity.compose)
-                implementation(libs.androidx.core.ktx)
-                implementation(libs.androidx.appcompat)
-
-                implementation(projects.sampleApp.shared)
-            }
-        }
-    }
-}
-
 android {
     namespace = "io.github.kalinjul.easydocumentscan.sample"
 
@@ -27,4 +11,20 @@ android {
         versionCode = 1
         versionName = "1.0"
     }
+
+    buildTypes {
+        debug {
+            isMinifyEnabled = true
+//            setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), ("proguard-rules.pro")))
+        }
+    }
 }
+
+
+dependencies {
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+
+    implementation(projects.sampleApp.shared)
+}
diff --git a/sample-app/android-app/src/main/AndroidManifest.xml b/sample-app/android-app/src/main/AndroidManifest.xml
diff --git a/sample-app/android-app/src/main/kotlin/org/publicvalue/multiplatform/qrcode/sample/MainActivity.kt b/sample-app/android-app/src/main/kotlin/org/publicvalue/multiplatform/qrcode/sample/MainActivity.kt
diff --git a/sample-app/android-app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/sample-app/android-app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/sample-app/android-app/src/main/res/drawable/ic_launcher_background.xml b/sample-app/android-app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/sample-app/android-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/sample-app/android-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/sample-app/android-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sample-app/android-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/sample-app/android-app/src/main/res/values/strings.xml b/sample-app/android-app/src/main/res/values/strings.xml
diff --git a/sample-app/shared/build.gradle.kts b/sample-app/shared/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import io.github.kalinjul.convention.config.configureIosTargets
 
 plugins {
-    id("io.github.kalinjul.convention.android.library")
     id("io.github.kalinjul.convention.kotlin.multiplatform.mobile")
+    id("io.github.kalinjul.convention.android.library")
     id("io.github.kalinjul.convention.compose.multiplatform")
 }
 
@@ -13,9 +13,9 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(compose.runtime)
-                implementation(compose.foundation)
-                implementation(compose.material3)
+                implementation(libs.compose.runtime)
+                implementation(libs.compose.foundation)
+                implementation(libs.compose.material3)
 
                 implementation(projects.documentscannerCompose)
             }
@@ -33,8 +33,7 @@ kotlin {
 //            export("io.github.kalinjul.kotlin.multiplatform:oidc-appsupport")
         }
     }
-}
-
-android {
-    namespace = "io.github.kalinjul.easydocumentscan.sample.shared"
-}
+    android {
+        namespace = "io.github.kalinjul.easydocumentscan.sample.shared"
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package io.github.kalinjul.convention`
`2`	`2`
`3`	`3`	`import org.gradle.api.Plugin`
`4`	`4`	`import org.gradle.api.Project`
`5`		`-import org.gradle.configurationcache.extensions.capitalized`
`6`	`5`	`import org.gradle.kotlin.dsl.configure`
`7`	`6`	`import org.gradle.kotlin.dsl.dependencies`
`8`	`7`	`import org.gradle.kotlin.dsl.getByType`
`@@ -48,3 +47,5 @@ private fun Project.addKspDependencyForAllTargets(`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`	`}`
	`50`	`+`
	`51`	`+fun String.capitalized() = replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import io.github.kalinjul.convention.config.configureIosTargets`
`4`	`4`	`import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl`
`5`	`5`
`6`	`6`	`plugins {`
`7`		`- id("io.github.kalinjul.convention.android.library")`
`8`	`7`	`id("io.github.kalinjul.convention.kotlin.multiplatform.mobile")`
	`8`	`+ id("io.github.kalinjul.convention.android.library")`
`9`	`9`	`id("io.github.kalinjul.convention.centralPublish")`
`10`	`10`	`id("io.github.kalinjul.convention.compose.multiplatform")`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-keep class * implements com.google.firebase.components.ComponentRegistrar {`
	`2`	`+ public <init>();`
	`3`	`+}`