Upgrading to Kotlin 2

guimauvedigital · May 24, 2024 · 1ac0bac · 1ac0bac
1 parent 057643f
commit 1ac0bac
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git 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
@@ -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
+yarn.lock
diff --git 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
@@ -3,15 +3,15 @@
 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
 
 <dependency>
     <groupId>me.nathanfallet.makth</groupId>
     <artifactId>makth-jvm</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6</version>
 </dependency>
 ```