Adds uses-sdk to generated AndroidManifest.xml in krpoject specifying…

… minSdk and targetSdk (#2004)
korlibs · Jul 11, 2024 · 6f2c3ee · 6f2c3ee
1 parent 4ae87fc
commit 6f2c3ee
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/korge-gradle-plugin/src/main/kotlin/com/soywiz/kproject/AndroidConfig.kt b/korge-gradle-plugin/src/main/kotlin/com/soywiz/kproject/AndroidConfig.kt
@@ -4,13 +4,19 @@ import org.gradle.api.*
 import java.io.*
 
 object AndroidConfig {
-    fun getAndroidManifestFile(project: Project): File {
+    fun getAndroidManifestFile(
+        project: Project,
+        minSdk: Int = korlibs.korge.gradle.targets.android.ANDROID_DEFAULT_MIN_SDK,
+        targetSdk: Int = korlibs.korge.gradle.targets.android.ANDROID_DEFAULT_TARGET_SDK,
+        compileSdk: Int = korlibs.korge.gradle.targets.android.ANDROID_DEFAULT_COMPILE_SDK,
+    ): File {
         return File(project.buildDir, "AndroidManifest.xml").also {
             if (!it.exists()) {
                 it.parentFile.mkdirs()
                 it.writeText(buildString {
                     appendLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>")
                     appendLine("<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\">")
+                    appendLine("    <uses-sdk android:minSdkVersion=\"${minSdk}\" android:targetSdkVersion=\"${targetSdk}\" />")
                     appendLine("</manifest>")
                 })
             }

diff --git a/korge-gradle-plugin/src/main/kotlin/com/soywiz/kproject/KProjectPlugin.kt b/korge-gradle-plugin/src/main/kotlin/com/soywiz/kproject/KProjectPlugin.kt
@@ -75,11 +75,19 @@ class KProjectPlugin : Plugin<Project> {
                     compileDebugJavaWithJavac?.compilerOptions?.jvmTarget?.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(androidJvmVersion))
                 }
                 project.extensions.getByType(LibraryExtension::class.java).apply {
-                    compileSdk = ANDROID_DEFAULT_COMPILE_SDK
+                    val compileSdk = ANDROID_DEFAULT_COMPILE_SDK
+                    val targetSdk = ANDROID_DEFAULT_TARGET_SDK
+                    val minSdk = ANDROID_DEFAULT_MIN_SDK
+                    this.compileSdk = ANDROID_DEFAULT_COMPILE_SDK
                     namespace = ("${project.group}.${project.name}").replace("-", ".")
                     sourceSets.apply {
                         maybeCreate("main").apply {
-                            manifest.srcFile(AndroidConfig.getAndroidManifestFile(project))
+                            manifest.srcFile(AndroidConfig.getAndroidManifestFile(
+                                project,
+                                minSdk = minSdk,
+                                targetSdk = targetSdk,
+                                compileSdk = compileSdk,
+                            ))
                         }
                     }
                 }