Update template: codecov + kover + binary compatibility

.github/workflows/DEPLOY.yml

@@ -46,10 +46,10 @@ jobs:
  - { os: ubuntu-latest, publishTask: "publishAndroidDebugPublicationToMavenLocal publishAndroidReleasePublicationToMavenLocal" }
  - { os: ubuntu-latest, publishTask: "publishKotlinMultiplatformPublicationToMavenLocal publishJvmPublicationToMavenLocal" }
  - { os: ubuntu-latest, publishTask: "publishJsPublicationToMavenLocal publishWasmJsPublicationToMavenLocal" }
- - { os: macos-latest, publishTask: "publishMacosX64PublicationToMavenLocal publishMacosArm64PublicationToMavenLocal" }
- - { os: macos-latest, publishTask: "publishTvosArm64PublicationToMavenLocal publishTvosSimulatorArm64PublicationToMavenLocal publishTvosX64PublicationToMavenLocal" }
- - { os: macos-latest, publishTask: "publishIosArm64PublicationToMavenLocal publishIosSimulatorArm64PublicationToMavenLocal publishIosX64PublicationToMavenLocal" }
- - { os: macos-latest, publishTask: "publishWatchosArm64PublicationToMavenLocal publishWatchosArm32PublicationToMavenLocal publishWatchosDeviceArm64PublicationToMavenLocal publishWatchosSimulatorArm64PublicationToMavenLocal" }
+ - { os: macos-13, publishTask: "publishMacosX64PublicationToMavenLocal publishMacosArm64PublicationToMavenLocal" }
+ - { os: macos-13, publishTask: "publishTvosArm64PublicationToMavenLocal publishTvosSimulatorArm64PublicationToMavenLocal publishTvosX64PublicationToMavenLocal" }
+ - { os: macos-13, publishTask: "publishIosArm64PublicationToMavenLocal publishIosSimulatorArm64PublicationToMavenLocal publishIosX64PublicationToMavenLocal" }
+ - { os: macos-13, publishTask: "publishWatchosArm64PublicationToMavenLocal publishWatchosArm32PublicationToMavenLocal publishWatchosDeviceArm64PublicationToMavenLocal publishWatchosSimulatorArm64PublicationToMavenLocal" }
  timeout-minutes: 300
  runs-on: ${{ matrix.os }}
  ##needs: [start]

.github/workflows/TEST.yml

@@ -4,8 +4,20 @@ name: TEST
 on:
  push:
  branches: [ main, 'release/**' ]
+ paths:
+ - '**'
+ - '!**.gitignore'
+ - '!**.md'
+ - '!**.github/workflows/*'
+ - '**.github/workflows/TEST.yml'
  pull_request:
  branches: [ main, 'release/**' ]
+ paths:
+ - '**'
+ - '!**.gitignore'
+ - '!**.md'
+ - '!**.github/workflows/*'
+ - '**.github/workflows/TEST.yml'
 
 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -23,16 +35,10 @@ jobs:
  fail-fast: true # Once working, comment this
  matrix:
  include:
- - { outputKey: testWindows, os: windows-latest, testTask: mingwX64Test, enableKotlinNative: true }
- - { outputKey: testLinux, os: ubuntu-latest, testTask: linuxX64Test, buildTasks: publishLinuxArm64PublicationToMavenLocal, enableKotlinNative: true }
- - { outputKey: testMacos, os: macos-latest, testTask: macosX64Test, buildTasks: publishMacosArm64PublicationToMavenLocal, enableKotlinNative: true }
- - { outputKey: testIos, os: macos-latest, testTask: iosX64Test, enableKotlinNative: true }
- #- { outputKey: testJs, os: ubuntu-latest, testTask: "wasmBrowserTest", buildTasks: "jsNodeTest jsBrowserTest" }
- - { outputKey: testJs, os: ubuntu-latest, testTask: "wasmBrowserTest", buildTasks: "jsBrowserTest jsDenoTest" }
- - { outputKey: testAndroid, os: ubuntu-latest, enableAndroid: true }
- - { outputKey: testJvmMacos, os: macos-latest, testTask: jvmTest }
- - { outputKey: testJvmLinux, os: ubuntu-latest, testTask: jvmTest, precompileTask: compileTestKotlinJvm, enableKotlinNative: true, enableSandbox: true, e2e: true }
- - { outputKey: testJvmWindows, os: windows-latest, testTask: jvmTest, precompileTask: compileTestKotlinJvm }
+ - { outputKey: testMacosIos, os: macos-13, testTask: jvmTest macosX64Test iosX64Test, buildTasks: publishMacosArm64PublicationToMavenLocal }
+ - { outputKey: testJsAndroid, os: ubuntu-latest, testTask: "wasmBrowserTest", buildTasks: "jsBrowserTest jsDenoTest", enableAndroid: true }
+ - { outputKey: testLinux, os: ubuntu-latest, testTask: apiCheck jvmTest linuxX64Test, precompileTask: compileTestKotlinJvm, e2e: true }
+ - { outputKey: testWindows, os: windows-latest, testTask: jvmTest mingwX64Test jsDenoTest, precompileTask: compileTestKotlinJvm, enableCodecov: true }
  #if: ${{ needs.changes.outputs[matrix.outputKey] == 'true' }}
  timeout-minutes: 30
  runs-on: ${{ matrix.os }}
@@ -44,15 +50,17 @@ jobs:
  - { name: Set up JDK, uses: actions/setup-java@v4, with: { distribution: "${{ env.JAVA_DISTRIBUTION }}", java-version: "${{ env.JAVA_VERSION }}" } }
  - { name: Prepare Gradle, uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 } # https://github.com/gradle/actions/releases/tag/v3.5.0
  - { name: Start gradle, run: ./gradlew }
- - { if: "${{ matrix.precompileTask }}", name: "Building ${{ matrix.precompileTask }} classes", run: "./gradlew --no-configuration-cache --stacktrace ${{ matrix.precompileTask }}" }
- - { if: "${{ matrix.testTask }}", name: "Run ${{ matrix.testTask }} tests", run: "./gradlew --no-configuration-cache ${{ matrix.testTask }}" }
- - { if: "${{ matrix.buildTasks }}", name: "Run ${{ matrix.buildTasks }}", run: "./gradlew --no-configuration-cache ${{ matrix.buildTasks }}" }
+ - { if: "${{ matrix.precompileTask }}", name: "Building ${{ matrix.precompileTask }} classes", run: "./gradlew --no-configuration-cache --stacktrace --build-cache ${{ matrix.precompileTask }}" }
+ - { if: "${{ matrix.enableCodecov }}", name: "Upload coverage reports to Codecov", uses: "codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673", with: { token: "${{ secrets.CODECOV_TOKEN }}" } } # https://github.com/codecov/codecov-action/releases/tag/v4.5.0
+ - { if: "${{ matrix.testTask }}", name: "Run ${{ matrix.testTask }} tests", run: "./gradlew --no-configuration-cache --build-cache ${{ matrix.testTask }}" }
+ - { if: "${{ matrix.buildTasks }}", name: "Run ${{ matrix.buildTasks }}", run: "./gradlew --no-configuration-cache --build-cache ${{ matrix.buildTasks }}" }
  - name: Enable KVM
  if: "${{ matrix.enableAndroid }}"
  run: |
  echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
  sudo udevadm control --reload-rules
  sudo udevadm trigger --name-match=kvm
- - { name: "Run Android Tests", if: "${{ matrix.enableAndroid }}", uses: reactivecircus/android-emulator-runner@v2, with: { "api-level": 21, "script": "./gradlew --no-configuration-cache connectedCheck lintDebug" } }
+ - { name: "Run Android Tests", if: "${{ matrix.enableAndroid }}", uses: reactivecircus/android-emulator-runner@v2, with: { "api-level": 21, "script": "./gradlew --no-configuration-cache --build-cache connectedCheck lintDebug" } }
  - { name: Archive Test Results, if: failure(), uses: actions/upload-artifact@v4, with: { name: "test-results-${{ matrix.outputKey }}", retention-days: 21, path: "**/build/reports", if-no-files-found: ignore } }
- - { if: "${{ matrix.e2e }}", name: Publish to maven local, run: ./gradlew --no-configuration-cache publishJvmLocal publishKotlinMultiplatformPublicationToMavenLocal }
+ - { if: "${{ matrix.e2e }}", name: Publish to maven local, run: ./gradlew --no-configuration-cache --build-cache publishJvmLocal publishKotlinMultiplatformPublicationToMavenLocal }
+ - { name: Code coverage, run: ./gradlew --build-cache koverXmlReport }

build.gradle.kts

@@ -17,6 +17,8 @@ import java.util.concurrent.*
 plugins {
  kotlin("multiplatform") version "2.0.0"
  id("com.android.library") version "8.2.2"
+ id("org.jetbrains.kotlinx.kover") version "0.8.3" apply false
+ id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.2"
  id("org.jetbrains.dokka") version "1.9.20"
  `maven-publish`
  signing
@@ -32,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 {
@@ -55,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 {
  // […]
@@ -343,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()
@@ -971,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")
  }
  )
  }
@@ -988,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")
@@ -1109,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",
+ )
+ }
  }
  }
  }
@@ -1122,6 +1143,7 @@ allprojects {
 
 subprojects {
  plugins.apply("org.jetbrains.dokka")
+ plugins.apply("org.jetbrains.kotlinx.kover")
 }
 
 allprojects {
@@ -1130,3 +1152,7 @@ allprojects {
  offlineMode.set(true)
  }
 }
+
+apiValidation {
+ ignoredProjects.addAll(listOf(rootProject.name))
+}

korlibs-io-nodejs/api/android/korlibs-io-nodejs.api

@@ -0,0 +1,4 @@
+public final class korlibs/io/runtime/node/ConfigureNodeJsTargetKt {
+ public static final fun configureNodeJsTarget ()V
+}
+

korlibs-io-nodejs/api/jvm/korlibs-io-nodejs.api

@@ -0,0 +1,4 @@
+public final class korlibs/io/runtime/node/ConfigureNodeJsTargetKt {
+ public static final fun configureNodeJsTarget ()V
+}
+