diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 628a040..a880201 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,6 +17,6 @@ jobs: distribution: temurin java-version: 19 - name: Install dependencies and run tests - run: ./gradlew test koverXmlReport + run: ./gradlew jvmTest koverXmlReport - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 \ No newline at end of file + uses: codecov/codecov-action@v3 diff --git a/build.gradle.kts b/build.gradle.kts index 0a90ab8..67afc7a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,19 +1,43 @@ plugins { - kotlin("multiplatform") version "1.9.10" + kotlin("multiplatform") version "1.9.20" id("convention.publication") id("org.jetbrains.kotlinx.kover") version "0.7.4" - id("com.google.devtools.ksp") version "1.9.10-1.0.13" + id("com.google.devtools.ksp") version "1.9.20-1.0.13" id("dev.petuska.npm.publish") version "3.4.1" } group = "me.nathanfallet.makth" -version = "1.2.2" +version = "1.2.3" repositories { mavenCentral() } kotlin { + // Tiers are in accordance with + // Tier 1 + macosX64() + macosArm64() + iosSimulatorArm64() + iosX64() + + // Tier 2 + linuxX64() + linuxArm64() + watchosSimulatorArm64() + watchosX64() + watchosArm32() + watchosArm64() + tvosSimulatorArm64() + tvosX64() + tvosArm64() + iosArm64() + + // Tier 3 + mingwX64() + watchosDeviceArm64() + + // jvm & js jvm { jvmToolchain(19) withJava() @@ -29,19 +53,8 @@ kotlin { browser() //generateTypeScriptDefinitions() // Not supported for now because of collections etc... } - val hostOs = System.getProperty("os.name") - val isArm64 = System.getProperty("os.arch") == "aarch64" - val isMingwX64 = hostOs.startsWith("Windows") - val nativeTarget = when { - hostOs == "Mac OS X" && isArm64 -> macosArm64("native") - hostOs == "Mac OS X" && !isArm64 -> macosX64("native") - hostOs == "Linux" && isArm64 -> linuxArm64("native") - hostOs == "Linux" && !isArm64 -> linuxX64("native") - isMingwX64 -> mingwX64("native") - else -> throw GradleException("Host OS is not supported in Kotlin/Native.") - } - + applyDefaultHierarchyTemplate() sourceSets { all { languageSettings.apply { diff --git a/docs/getstarted/install.md b/docs/getstarted/install.md index bcc2538..fafee27 100644 --- a/docs/getstarted/install.md +++ b/docs/getstarted/install.md @@ -8,7 +8,7 @@ Add the following to your `pom.xml` file; me.nathanfallet.makth makth-jvm - 1.2.2 + 1.2.3 ``` @@ -22,7 +22,7 @@ repositories { } dependencies { - implementation 'me.nathanfallet.makth:makth:1.2.2' + implementation 'me.nathanfallet.makth:makth:1.2.3' } ```