Skip to content

Commit e3e8ede

Browse files
oshaioshai
authored
update multiplatform to 2.1.20 (#498)
move to toml versions
1 parent 871ee98 commit e3e8ede

File tree

4 files changed

+97
-64
lines changed

4 files changed

+97
-64
lines changed

‎build.gradle.kts‎

Lines changed: 47 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// File: build.gradle.kts
12
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
23
import org.gradle.jvm.tasks.Jar
34
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
@@ -7,22 +8,15 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
78
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
89

910
plugins {
10-
kotlin("multiplatform") version "2.0.21"
11-
// This version is dependent on the maximum tested version
12-
// of this plugin within the Kotlin multiplatform library
13-
id("com.android.library") version "8.9.1"
14-
15-
id("org.jetbrains.dokka") version "2.0.0"
16-
17-
id("com.diffplug.spotless") version "7.0.3"
18-
19-
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
11+
alias(libs.plugins.kotlin.multiplatform)
12+
alias(libs.plugins.android.library)
13+
alias(libs.plugins.dokka)
14+
alias(libs.plugins.spotless)
15+
alias(libs.plugins.nexus.publish.plugin)
2016
`maven-publish`
2117
signing
2218
}
2319

24-
apply("versions.gradle.kts")
25-
2620
group = "io.github.oshai"
2721
version = "7.0.7"
2822

@@ -134,72 +128,72 @@ kotlin {
134128
val javaMain by creating {
135129
dependsOn(commonMain)
136130
dependencies {
137-
compileOnly("org.slf4j:slf4j-api:${extra["slf4j_version"]}")
138-
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:${extra["coroutines_version"]}")
131+
compileOnly(libs.slf4j.api)
132+
compileOnly(libs.kotlinx.coroutines.slf4j)
139133
}
140134
}
141135
val jvmMain by getting {
142136
dependsOn(javaMain)
143137
dependencies {
144-
compileOnly("org.slf4j:slf4j-api:${extra["slf4j_version"]}")
145-
compileOnly("ch.qos.logback:logback-classic:${extra["logback_version"]}")
146-
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:${extra["coroutines_version"]}")
147-
compileOnly("org.graalvm.sdk:nativeimage:${extra["nativeimage_version"]}")
138+
compileOnly(libs.slf4j.api)
139+
compileOnly(libs.logback.classic)
140+
compileOnly(libs.kotlinx.coroutines.slf4j)
141+
compileOnly(libs.nativeimage)
148142
}
149143
}
150144
val jvmLogbackTest by getting {
151-
dependencies {
152-
implementation(kotlin("test"))
153-
implementation("org.junit.jupiter:junit-jupiter-engine:${extra["junit_version"]}")
154-
implementation("org.junit.jupiter:junit-jupiter-params:${extra["junit_version"]}")
155-
implementation("org.mockito:mockito-core:${extra["mockito_version"]}")
156-
implementation("org.slf4j:slf4j-api:${extra["slf4j_version"]}")
157-
implementation("ch.qos.logback:logback-classic:${extra["logback_version"]}")
158-
implementation("net.logstash.logback:logstash-logback-encoder:${extra["logstash_logback_encoder_version"]}")
159-
implementation("com.fasterxml.jackson.core:jackson-core:${extra["jackson_version"]}")
160-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${extra["jackson_version"]}")
161-
}
145+
dependencies {
146+
implementation(kotlin("test"))
147+
implementation(libs.junit.jupiter.engine)
148+
implementation(libs.junit.jupiter.params)
149+
implementation(libs.mockito.core)
150+
implementation(libs.slf4j.api)
151+
implementation(libs.logback.classic)
152+
implementation(libs.logstash.logback.encoder)
153+
implementation(libs.jackson.core)
154+
implementation(libs.jackson.module.kotlin)
155+
}
162156
}
163157
val jvmTest by getting {
164158
dependencies {
165159
implementation(kotlin("test"))
166-
implementation("org.junit.jupiter:junit-jupiter-engine:${extra["junit_version"]}")
167-
implementation("org.junit.jupiter:junit-jupiter-params:${extra["junit_version"]}")
168-
implementation("org.mockito:mockito-core:${extra["mockito_version"]}")
169-
implementation("org.apache.logging.log4j:log4j-api:${extra["log4j_version"]}")
170-
implementation("org.apache.logging.log4j:log4j-core:${extra["log4j_version"]}")
171-
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:${extra["log4j_version"]}")
172-
implementation("org.slf4j:slf4j-api:${extra["slf4j_version"]}")
160+
implementation(libs.junit.jupiter.engine)
161+
implementation(libs.junit.jupiter.params)
162+
implementation(libs.mockito.core)
163+
implementation(libs.log4j.api)
164+
implementation(libs.log4j.core)
165+
implementation(libs.log4j.slf4j2.impl)
166+
implementation(libs.slf4j.api)
173167

174168
// our jul test just forward the logs jul -> slf4j -> log4j
175-
implementation("org.slf4j:jul-to-slf4j:${extra["slf4j_version"]}")
176-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:${extra["coroutines_version"]}")
177-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${extra["coroutines_version"]}")
178-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${extra["coroutines_version"]}")
169+
implementation(libs.jul.to.slf4j)
170+
implementation(libs.kotlinx.coroutines.slf4j)
171+
implementation(libs.kotlinx.coroutines.core)
172+
implementation(libs.kotlinx.coroutines.test)
179173
}
180174
}
181175
val androidMain by getting {
182176
dependsOn(javaMain)
183177
dependencies {
184-
compileOnly("org.slf4j:slf4j-api:${extra["slf4j_version"]}")
185-
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:${extra["coroutines_version"]}")
178+
compileOnly(libs.slf4j.api)
179+
compileOnly(libs.kotlinx.coroutines.slf4j)
186180
}
187181
}
188182
val androidUnitTest by getting {
189183
dependencies {
190184
implementation(kotlin("test"))
191-
implementation("org.junit.jupiter:junit-jupiter-engine:${extra["junit_version"]}")
192-
implementation("org.junit.jupiter:junit-jupiter-params:${extra["junit_version"]}")
193-
implementation("org.mockito:mockito-core:${extra["mockito_version"]}")
194-
implementation("org.apache.logging.log4j:log4j-api:${extra["log4j_version"]}")
195-
implementation("org.apache.logging.log4j:log4j-core:${extra["log4j_version"]}")
196-
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:${extra["log4j_version"]}")
197-
implementation("org.slf4j:slf4j-api:${extra["slf4j_version"]}")
185+
implementation(libs.junit.jupiter.engine)
186+
implementation(libs.junit.jupiter.params)
187+
implementation(libs.mockito.core)
188+
implementation(libs.log4j.api)
189+
implementation(libs.log4j.core)
190+
implementation(libs.log4j.slf4j2.impl)
191+
implementation(libs.slf4j.api)
198192
// our jul test just forward the logs jul -> slf4j -> log4j
199-
implementation("org.slf4j:jul-to-slf4j:${extra["slf4j_version"]}")
200-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:${extra["coroutines_version"]}")
201-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${extra["coroutines_version"]}")
202-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${extra["coroutines_version"]}")
193+
implementation(libs.jul.to.slf4j)
194+
implementation(libs.kotlinx.coroutines.slf4j)
195+
implementation(libs.kotlinx.coroutines.core)
196+
implementation(libs.kotlinx.coroutines.test)
203197
}
204198
}
205199
val directMain by creating {
@@ -326,8 +320,6 @@ nexusPublishing {
326320
}
327321
}
328322

329-
apply(plugin = "io.github.gradle-nexus.publish-plugin")
330-
331323
publishing {
332324
publications.withType<MavenPublication> {
333325
pom {

‎gradle/libs.versions.toml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
[versions]
2+
3+
kotlin = "2.1.20"
4+
android-gradle-plugin = "8.9.1"
5+
dokka = "2.0.0"
6+
spotless = "7.0.3"
7+
nexus-publish-plugin = "2.0.0"
8+
9+
slf4j = "2.0.13"
10+
logback = "1.5.11"
11+
logstash-logback-encoder = "8.0"
12+
coroutines = "1.8.0"
13+
junit = "5.9.2"
14+
mockito = "4.11.0"
15+
jackson = "2.18.3"
16+
log4j = "2.22.0"
17+
nativeimage = "24.2.0"
18+
19+
[plugins]
20+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
21+
android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
22+
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
23+
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
24+
nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus-publish-plugin" }
25+
26+
[libraries]
27+
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
28+
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
29+
logstash-logback-encoder = { module = "net.logstash.logback:logstash-logback-encoder", version.ref = "logstash-logback-encoder" }
30+
31+
kotlinx-coroutines-slf4j = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j", version.ref = "coroutines" }
32+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
33+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
34+
35+
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
36+
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
37+
38+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
39+
40+
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
41+
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
42+
43+
log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
44+
log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
45+
log4j-slf4j2-impl = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version.ref = "log4j" }
46+
47+
jul-to-slf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
48+
49+
nativeimage = { module = "org.graalvm.sdk:nativeimage", version.ref = "nativeimage" }

‎settings.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ pluginManagement {
77
}
88

99
rootProject.name = "kotlin-logging"
10+
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

‎versions.gradle.kts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)