Update template: codecov + kover + binary compatibility (#2)

korlibs · Aug 6, 2024 · cc954f7 · cc954f7
1 parent 886f4dc
commit cc954f7
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 24 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,10 @@ var REAL_VERSION = System.getenv("FORCED_VERSION")
 
 //val REAL_VERSION = System.getenv("FORCED_VERSION") ?: "999.0.0.999"
 
-val JVM_TARGET = JvmTarget.JVM_1_8
+//val JVM_TARGET = JvmTarget.JVM_1_8
+//val JDK_VERSION = org.gradle.api.JavaVersion.VERSION_1_8
+val JVM_TARGET = JvmTarget.JVM_11
+val JDK_VERSION = org.gradle.api.JavaVersion.VERSION_11
 val GROUP = "com.soywiz"
 
 kotlin {
@@ -57,7 +60,29 @@ allprojects {
     project.apply(plugin = "kotlin-multiplatform")
     project.apply(plugin = "android-library")
 
+    java.toolchain.languageVersion = JavaLanguageVersion.of(JDK_VERSION.majorVersion)
+    kotlin.jvmToolchain(JDK_VERSION.majorVersion.toInt())
+    afterEvaluate {
+        tasks.withType(Test::class) {
+            //this.javaLauncher.set()
+            this.javaLauncher.set(javaToolchains.launcherFor {
+                // 17 is latest at the current moment
+                languageVersion.set(JavaLanguageVersion.of(JDK_VERSION.majorVersion))
+            })
+        }
+    }
+
+    kotlin {
+        androidTarget {
+            this.compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+
     android {
+        compileOptions {
+            sourceCompatibility = JDK_VERSION
+            targetCompatibility = JDK_VERSION
+        }
         //signingConfigs {
         //    debug {
         //        […]
@@ -345,19 +370,6 @@ subprojects {
     apply(plugin = "maven-publish")
     apply(plugin = "signing")
 
-    //val JDK_VERSION = 8
-    //java.toolchain.languageVersion = JavaLanguageVersion.of(JDK_VERSION)
-    //kotlin.jvmToolchain(JDK_VERSION)
-    //afterEvaluate {
-    //    tasks.withType(Test::class) {
-    //        //this.javaLauncher.set()
-    //        this.javaLauncher.set(javaToolchains.launcherFor {
-    //            // 17 is latest at the current moment
-    //            languageVersion.set(JavaLanguageVersion.of(JDK_VERSION))
-    //        })
-    //    }
-    //}
-
     kotlin {
         js {
             //nodejs()
@@ -973,10 +985,12 @@ class MicroAmper(val project: Project) {
                 main = maybeCreate("${name}Main").also {
                     it.kotlin.srcDirIfExists("src$atName")
                     it.resources.srcDirIfExists("resources$atName")
+                    it.kotlin.srcDir("build/generated/ksp/$name/${name}Main/kotlin")
                 },
                 test = maybeCreate("${name}Test").also {
                     it.kotlin.srcDirIfExists("test$atName")
                     it.resources.srcDirIfExists("testResources$atName")
+                    it.kotlin.srcDir("build/generated/ksp/$name/${name}Test/kotlin")
                 }
             )
         }
@@ -990,6 +1004,8 @@ class MicroAmper(val project: Project) {
             ssDependsOn("appleNonWatchos", "apple")
             ssDependsOn("appleIosTvos", "apple")
 
+            maybeCreate("commonMain").kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
+
             for (platform in kotlinPlatforms) {
                 val isMacos = platform.startsWith("macos")
                 val isIos = platform.startsWith("ios")
@@ -1111,11 +1127,14 @@ allprojects {
             afterEvaluate {
                 tasks.withType(org.gradle.api.tasks.testing.Test::class) {
                     //println("TEST-TASK: $this")
-                    jvmArgs(
-                        "--add-opens", "java.base/java.nio=ALL-UNNAMED",
-                        //"--add-opens", "java.base/jdk.incubator.foreign=ALL-UNNAMED",
-                        "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
-                    )
+                    if (JDK_VERSION.majorVersion.toInt() >= 9) {
+                        jvmArgs(
+                            "-XX:+IgnoreUnrecognizedVMOptions",
+                            "--add-opens", "java.base/java.nio=ALL-UNNAMED",
+                            //"--add-opens", "java.base/jdk.incubator.foreign=ALL-UNNAMED",
+                            "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
+                        )
+                    }
                 }
             }
         }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -7,14 +7,16 @@ pluginManagement {
         //maven("https://www.jetbrains.com/intellij-repository/releases")
         //maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
     }
-}
 
-plugins {
-    //id("org.jetbrains.amper.settings.plugin").version("0.2.1-dev-470")
-    //id("org.jetbrains.amper.settings.plugin").version("0.2.2")
-    //id("org.jetbrains.amper.settings.plugin").version("0.2.3-dev-473")
+    plugins {
+        id("com.google.devtools.ksp") version "2.0.0-1.0.23"
+        //id("org.jetbrains.amper.settings.plugin").version("0.2.1-dev-470")
+        //id("org.jetbrains.amper.settings.plugin").version("0.2.2")
+        //id("org.jetbrains.amper.settings.plugin").version("0.2.3-dev-473")
+    }
 }
 
+
 for (file in rootDir.listFiles()) {
     if (file.isDirectory() && File(file, "module.yaml").exists()) {
         include(":${file.name}")