Skip to content

Commit 57cbf79

Browse files
committed
chore(deps): Update kotlin to 1.5.31, refactor build
* Gradle 7.2 * Version catalog libs.versions.toml * Other dependencies * Remove jcenter()
1 parent 5c72557 commit 57cbf79

6 files changed

+21
-11
lines changed

build.gradle.kts

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import io.github.petertrr.configureVersioning
33
import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
44

55
plugins {
6-
kotlin("multiplatform") version "1.5.0"
6+
alias(libs.plugins.kotlin.multiplatform)
77
jacoco
8-
id("com.github.ben-manes.versions") version "0.38.0"
8+
id("com.github.ben-manes.versions") version "0.39.0"
99
}
1010

1111
configureVersioning()
@@ -40,7 +40,7 @@ kotlin {
4040
val jvmTest by getting {
4141
dependencies {
4242
implementation(kotlin("test-junit5"))
43-
implementation("org.junit.jupiter:junit-jupiter-engine:5.7.1")
43+
implementation(libs.junit.jupiter.engine)
4444
}
4545
}
4646
val jsTest by getting {
@@ -72,8 +72,8 @@ val jacocoTestReportTask by tasks.register<JacocoReport>("jacocoTestReport") {
7272
additionalSourceDirs(kotlin.sourceSets["commonMain"].kotlin.sourceDirectories)
7373
classDirectories.setFrom(file("$buildDir/classes/kotlin/jvm"))
7474
reports {
75-
xml.isEnabled = true
76-
html.isEnabled = true
75+
xml.required.set(true)
76+
html.required.set(true)
7777
}
7878
}
7979
jvmTestTask.finalizedBy(jacocoTestReportTask)

buildSrc/build.gradle.kts

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ plugins {
55
repositories {
66
gradlePluginPortal()
77
mavenCentral()
8-
jcenter()
98
}
109

1110
dependencies {
1211
implementation("org.ajoberstar.reckon:reckon-gradle:0.13.0")
13-
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.20")
14-
implementation("io.github.gradle-nexus:publish-plugin:1.0.0")
12+
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.5.30")
13+
implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
1514
}

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
22
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
3-
org.gradle.parallel=true
4-
org.gradle.vfs.watch=true
3+
org.gradle.caching=true
4+
org.gradle.parallel=true

gradle/libs.versions.toml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[versions]
2+
kotlin = "1.5.31"
3+
junit = "5.8.1"
4+
5+
[plugins]
6+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
7+
8+
[libraries]
9+
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
10+
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

settings.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
rootProject.name = "kotlin-multiplatform-diff"
2+
enableFeaturePreview("VERSION_CATALOGS")

0 commit comments

Comments
 (0)