Upgrade Kotlin version with additional targets

.github/workflows/PR.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup and execute Gradle 'build' task
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: build -x jsBrowserTest
 
       - name: Upload allTests results
         uses: actions/[email protected]

README.md

@@ -1,6 +1,6 @@
 # Result
 
-[![Kotlin](https://img.shields.io/badge/kotlin-1.8.10-blue.svg)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.9.20-blue.svg)](http://kotlinlang.org)
 [![MavenCentral](https://maven-badges.herokuapp.com/maven-central/com.github.kittinunf.result/result-jvm/badge.svg)](https://search.maven.org/search?q=g:com.github.kittinunf.result)
 ![Run Gradle](https://github.com/kittinunf/Result/workflows/Run%20Gradle%20on%20Main/badge.svg?branch=master)
 [![Codecov](https://codecov.io/github/kittinunf/Result/coverage.svg?branch=master)](https://codecov.io/gh/kittinunf/Result)
@@ -227,9 +227,9 @@ the [ResultTest](./result/src/commonTest/kotlin/com/github/kittinunf/result/Resu
 
 If interested, here are more articles that one might enjoy.
 
-* http://fsharpforfunandprofit.com/posts/recipe-part2/
-* https://speakerdeck.com/swlaschin/railway-oriented-programming-a-functional-approach-to-error-handling
-* https://github.com/swlaschin/Railway-Oriented-Programming-Example
+* [Recipe Part 2](http://fsharpforfunandprofit.com/posts/recipe-part2/)
+* [Approach Error Handing](https://speakerdeck.com/swlaschin/railway-oriented-programming-a-functional-approach-to-error-handling)
+* [Example](https://github.com/swlaschin/Railway-Oriented-Programming-Example)
 
 Credit to Scott Wlaschin
 

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" }

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)
-        }
     }
 }