Upgrade Kotlin to 1.9.20 with applyDefaultHierarchyTemplate() and add…

…ed iosX64 target.
kittinunf · Nov 3, 2023 · b3f3cce · b3f3cce
1 parent f7ed13a
commit b3f3cce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 36 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.9.0"
-jacoco = "0.8.8"
+kotlin = "1.9.20"
+jacoco = "0.8.11"
 
 [libraries]
 kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }

diff --git a/result/build.gradle.kts b/result/build.gradle.kts
@@ -22,7 +22,8 @@ version = if (isReleaseBuild) artifactPublishVersion else "master-$gitSha-SNAPSH
 
 kotlin {
     jvm()
-    ios()
+    iosX64()
+    iosArm64()
     js(IR) {
         browser()
         binaries.executable()
@@ -31,6 +32,17 @@ kotlin {
     macosArm64()
     macosX64()
 
+    // Apply the default hierarchy again. It'll create, for example, the iosMain source set:
+    applyDefaultHierarchyTemplate()
+
+    targets.configureEach {
+        compilations.configureEach {
+            compilerOptions.configure {
+                freeCompilerArgs.add("-Xexpect-actual-classes")
+            }
+        }
+    }
+
     sourceSets {
         val commonMain by getting
 
@@ -53,39 +65,6 @@ kotlin {
                 implementation(libs.kotlin.test.js)
             }
         }
-
-        val appleMain by creating {
-            dependsOn(commonMain)
-        }
-        val appleTest by creating {
-            dependsOn(commonTest)
-        }
-
-        val iosMain by getting {
-            dependsOn(appleMain)
-        }
-        val macosArm64Main by getting {
-            dependsOn(appleMain)
-        }
-        val macosX64Main by getting {
-            dependsOn(appleMain)
-        }
-        val iosSimulatorArm64Main by getting {
-            dependsOn(appleMain)
-        }
-
-        val iosTest by getting {
-            dependsOn(appleTest)
-        }
-        val iosSimulatorArm64Test by getting {
-            dependsOn(appleTest)
-        }
-        val macosX64Test by getting {
-            dependsOn(appleTest)
-        }
-        val macosArm64Test by getting {
-            dependsOn(appleTest)
-        }
     }
 }