From 1ac0bac27eeb99734304e012f88569e2b6b9eeac Mon Sep 17 00:00:00 2001 From: NathanFallet Date: Fri, 24 May 2024 20:29:56 +0200 Subject: [PATCH] Upgrading to Kotlin 2 --- .github/workflows/tests.yml | 2 +- .gitignore | 4 +++- build.gradle.kts | 20 ++++++-------------- docs/getstarted/install.md | 4 ++-- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a880201..99605fc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: temurin - java-version: 19 + java-version: 21 - name: Install dependencies and run tests run: ./gradlew jvmTest koverXmlReport - name: Upload coverage to Codecov diff --git a/.gitignore b/.gitignore index f5a4e64..f4ec2ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .gradle +.kotlin .idea +.fleet build/ target/ !gradle/wrapper/gradle-wrapper.jar @@ -45,4 +47,4 @@ bin/ .DS_Store ### JS ### -yarn.lock \ No newline at end of file +yarn.lock diff --git a/build.gradle.kts b/build.gradle.kts index 8d0ba29..c267d5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,13 @@ plugins { - kotlin("multiplatform") version "1.9.20" + kotlin("multiplatform") version "2.0.0" id("convention.publication") - id("org.jetbrains.kotlinx.kover") version "0.7.4" - id("com.google.devtools.ksp") version "1.9.20-1.0.13" + id("org.jetbrains.kotlinx.kover") version "0.8.0" + id("com.google.devtools.ksp") version "2.0.0-1.0.21" id("dev.petuska.npm.publish") version "3.4.1" } group = "me.nathanfallet.makth" -version = "1.2.5" +version = "1.2.6" repositories { mavenCentral() @@ -38,8 +38,8 @@ kotlin { watchosDeviceArm64() // jvm & js + jvmToolchain(21) jvm { - jvmToolchain(19) withJava() testRuns.named("test") { executionTask.configure { @@ -63,7 +63,7 @@ kotlin { } val commonMain by getting { dependencies { - api("me.nathanfallet.usecases:usecases:1.5.6") + api("me.nathanfallet.usecases:usecases:1.6.1") } } val commonTest by getting { @@ -80,14 +80,6 @@ kotlin { } } -dependencies { - configurations - .filter { it.name.startsWith("ksp") && it.name.contains("Test") } - .forEach { - add(it.name, "io.mockative:mockative-processor:2.0.1") - } -} - npmPublish { readme.set(file("README.md")) registries { diff --git a/docs/getstarted/install.md b/docs/getstarted/install.md index 79e86c8..fda6402 100644 --- a/docs/getstarted/install.md +++ b/docs/getstarted/install.md @@ -3,7 +3,7 @@ Add dependency to your `build.gradle(.kts)` or `pom.xml`: ```kotlin -api("me.nathanfallet.makth:makth:1.2.5") +api("me.nathanfallet.makth:makth:1.2.6") ``` ```xml @@ -11,7 +11,7 @@ api("me.nathanfallet.makth:makth:1.2.5") me.nathanfallet.makth makth-jvm - 1.2.5 + 1.2.6 ```