update kmp configs

terrakok · Aug 29, 2024 · 8373348 · 8373348
1 parent 765b421
commit 8373348
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 34 deletions.
diff --git a/src/commonMain/kotlin/wizard/files/kmpLibrary/ModuleBuildGradleKts.kt b/src/commonMain/kotlin/wizard/files/kmpLibrary/ModuleBuildGradleKts.kt
@@ -29,13 +29,9 @@ class ModuleBuildGradleKts(info: ProjectInfo) : ProjectFile {
         appendLine("")
         appendLine("kotlin {")
         if (info.hasPlatform(ProjectPlatform.Android)) {
+            appendLine("    jvmToolchain(11)")
             appendLine("    androidTarget {")
             appendLine("        publishLibraryVariants(\"release\")")
-            appendLine("        compilations.all {")
-            appendLine("            kotlinOptions {")
-            appendLine("                jvmTarget = \"17\"")
-            appendLine("            }")
-            appendLine("        }")
             appendLine("    }")
             appendLine("")
         }
@@ -214,10 +210,6 @@ class ModuleBuildGradleKts(info: ProjectInfo) : ProjectFile {
             appendLine("    defaultConfig {")
             appendLine("        minSdk = ${info.androidMinSdk}")
             appendLine("    }")
-            appendLine("    compileOptions {")
-            appendLine("        sourceCompatibility = JavaVersion.VERSION_17")
-            appendLine("        targetCompatibility = JavaVersion.VERSION_17")
-            appendLine("    }")
             appendLine("}")
         }
 

diff --git a/src/jvmTest/kotlin/wizard/GeneratedKmpLibraryProjectTest.kt b/src/jvmTest/kotlin/wizard/GeneratedKmpLibraryProjectTest.kt
@@ -197,8 +197,8 @@ class GeneratedKmpLibraryProjectTest {
                       "platformType": "androidJvm",
                       "extras": {
                         "android": {
-                          "sourceCompatibility": "17",
-                          "targetCompatibility": "17"
+                          "sourceCompatibility": "11",
+                          "targetCompatibility": "11"
                         }
                       }
                     },
@@ -250,7 +250,7 @@ class GeneratedKmpLibraryProjectTest {
                       "platformType": "jvm",
                       "extras": {
                         "jvm": {
-                          "jvmTarget": "17",
+                          "jvmTarget": "11",
                           "withJavaEnabled": false
                         }
                       }

diff --git a/src/jvmTest/kotlin/wizard/KmpLibraryGeneratorTest.kt b/src/jvmTest/kotlin/wizard/KmpLibraryGeneratorTest.kt
@@ -56,13 +56,9 @@ class GeneratorTest {
                 version = "1.0"
 
                 kotlin {
+                    jvmToolchain(11)
                     androidTarget {
                         publishLibraryVariants("release")
-                        compilations.all {
-                            kotlinOptions {
-                                jvmTarget = "17"
-                            }
-                        }
                     }
 
                     jvm()
@@ -178,14 +174,10 @@ class GeneratorTest {
 
                 android {
                     namespace = "my.company.name"
-                    compileSdk = 34
+                    compileSdk = ${info.androidTargetSdk}
 
                     defaultConfig {
-                        minSdk = 26
-                    }
-                    compileOptions {
-                        sourceCompatibility = JavaVersion.VERSION_17
-                        targetCompatibility = JavaVersion.VERSION_17
+                        minSdk = ${info.androidMinSdk}
                     }
                 }
 
@@ -429,13 +421,9 @@ class GeneratorTest {
                 version = "1.0"
                 
                 kotlin {
+                    jvmToolchain(11)
                     androidTarget {
                         publishLibraryVariants("release")
-                        compilations.all {
-                            kotlinOptions {
-                                jvmTarget = "17"
-                            }
-                        }
                     }
                 
                     jvm()
@@ -454,14 +442,10 @@ class GeneratorTest {
                 
                 android {
                     namespace = "my.company"
-                    compileSdk = 34
+                    compileSdk = ${info.androidTargetSdk}
 
                     defaultConfig {
-                        minSdk = 26
-                    }
-                    compileOptions {
-                        sourceCompatibility = JavaVersion.VERSION_17
-                        targetCompatibility = JavaVersion.VERSION_17
+                        minSdk = ${info.androidMinSdk}
                     }
                 }