From 3ce34a5d6798ce52539a46998c7b141c8e4429ad Mon Sep 17 00:00:00 2001
From: Jun Sekine <jun@sakamo.to>
Date: Mon, 30 Dec 2024 14:58:43 +0900
Subject: [PATCH 1/2] KMP 2.1

---
 .gitignore       | 5 ++++-
 build.gradle.kts | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index cefcb35..bab889f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,7 @@ test.csv
 .idea/*
 
 # Ignore yarn.lcok
-kotlin-js-store/yarn.lock
\ No newline at end of file
+kotlin-js-store/yarn.lock
+
+# Kotlin 2.0
+.kotlin/
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index e2e0a4f..9bcbe56 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     java
-    kotlin("multiplatform") version "1.7.21"
+    kotlin("multiplatform") version "2.1.0"
     id("org.jetbrains.dokka").version("1.7.20")
     `maven-publish`
     signing
@@ -38,7 +38,7 @@ kotlin {
             artifact(dokkaJar)
         }
     }
-    js(BOTH) {
+    js {
         browser {
         }
         nodejs {

From 0c842e411500c2e4306d1b3ed37256aacdf0be9b Mon Sep 17 00:00:00 2001
From: Jun Sekine <jun@sakamo.to>
Date: Mon, 30 Dec 2024 20:32:19 +0900
Subject: [PATCH 2/2] remove Gradle java plugin & jacoco

---
 .github/workflows/build_and_test.yml |  3 +--
 build.gradle.kts                     | 32 ++--------------------------
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 3220cdc..3adc68f 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -38,8 +38,7 @@ jobs:
 
       - name: Run checks and generate report
         run: |
-          ./gradlew clean check
-          ./gradlew jacocoTestReport
+          ./gradlew clean check koverXmlReport
 
       - name: Upload coverage report to Codecov
         uses: codecov/codecov-action@v4
diff --git a/build.gradle.kts b/build.gradle.kts
index 9bcbe56..7709749 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,9 @@
 plugins {
-    java
     kotlin("multiplatform") version "2.1.0"
     id("org.jetbrains.dokka").version("1.7.20")
+    id("org.jetbrains.kotlinx.kover") version "0.9.0"
     `maven-publish`
     signing
-    jacoco
 }
 
 group = "com.jsoizo"
@@ -129,31 +128,4 @@ publishing {
 
 signing {
     sign(publishing.publications)
-}
-
-/////////////////////////////////////////
-//         Jacoco setting              //
-/////////////////////////////////////////
-jacoco {
-    toolVersion = "0.8.8"
-}
-tasks.jacocoTestReport {
-    val coverageSourceDirs = arrayOf(
-        "commonMain/src",
-        "jvmMain/src"
-    )
-    val classFiles = File("${buildDir}/classes/kotlin/jvm/")
-        .walkBottomUp()
-        .toSet()
-    classDirectories.setFrom(classFiles)
-    sourceDirectories.setFrom(files(coverageSourceDirs))
-    additionalSourceDirs.setFrom(files(coverageSourceDirs))
-
-    executionData
-        .setFrom(files("${buildDir}/jacoco/jvmTest.exec"))
-
-    reports {
-        xml.required.set(true)
-        html.required.set(false)
-    }
-}
+}
\ No newline at end of file