Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

version up KMP to 2.1 #153

Merged
merged 2 commits into from
Dec 30, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -14,4 +14,7 @@ test.csv
.idea/*

# Ignore yarn.lcok
kotlin-js-store/yarn.lock
kotlin-js-store/yarn.lock

# Kotlin 2.0
.kotlin/
36 changes: 4 additions & 32 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
plugins {
java
kotlin("multiplatform") version "1.7.21"
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"
@@ -38,7 +37,7 @@ kotlin {
artifact(dokkaJar)
}
}
js(BOTH) {
js {
browser {
}
nodejs {
@@ -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)
}
}
}