Skip to content

Commit 6512bb7

Browse files
authored
Merge pull request #153 from jsoizo/kmp_2
version up KMP to 2.1
2 parents 823c4d0 + 0c842e4 commit 6512bb7

File tree

3 files changed

+9
-35
lines changed

3 files changed

+9
-35
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ jobs:
3838

3939
- name: Run checks and generate report
4040
run: |
41-
./gradlew clean check
42-
./gradlew jacocoTestReport
41+
./gradlew clean check koverXmlReport
4342
4443
- name: Upload coverage report to Codecov
4544
uses: codecov/codecov-action@v4

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ test.csv
1414
.idea/*
1515

1616
# Ignore yarn.lcok
17-
kotlin-js-store/yarn.lock
17+
kotlin-js-store/yarn.lock
18+
19+
# Kotlin 2.0
20+
.kotlin/

build.gradle.kts

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
plugins {
2-
java
3-
kotlin("multiplatform") version "1.7.21"
2+
kotlin("multiplatform") version "2.1.0"
43
id("org.jetbrains.dokka").version("1.7.20")
4+
id("org.jetbrains.kotlinx.kover") version "0.9.0"
55
`maven-publish`
66
signing
7-
jacoco
87
}
98

109
group = "com.jsoizo"
@@ -38,7 +37,7 @@ kotlin {
3837
artifact(dokkaJar)
3938
}
4039
}
41-
js(BOTH) {
40+
js {
4241
browser {
4342
}
4443
nodejs {
@@ -129,31 +128,4 @@ publishing {
129128

130129
signing {
131130
sign(publishing.publications)
132-
}
133-
134-
/////////////////////////////////////////
135-
// Jacoco setting //
136-
/////////////////////////////////////////
137-
jacoco {
138-
toolVersion = "0.8.8"
139-
}
140-
tasks.jacocoTestReport {
141-
val coverageSourceDirs = arrayOf(
142-
"commonMain/src",
143-
"jvmMain/src"
144-
)
145-
val classFiles = File("${buildDir}/classes/kotlin/jvm/")
146-
.walkBottomUp()
147-
.toSet()
148-
classDirectories.setFrom(classFiles)
149-
sourceDirectories.setFrom(files(coverageSourceDirs))
150-
additionalSourceDirs.setFrom(files(coverageSourceDirs))
151-
152-
executionData
153-
.setFrom(files("${buildDir}/jacoco/jvmTest.exec"))
154-
155-
reports {
156-
xml.required.set(true)
157-
html.required.set(false)
158-
}
159-
}
131+
}

0 commit comments

Comments
 (0)