Skip to content

Commit ed339a8

Browse files
gesellixgesellix
authored
Migrate to Gradle's Version Catalogs (#403)
https://docs.gradle.org/current/userguide/version_catalogs.html
1 parent 78f88b1 commit ed339a8

File tree

4 files changed

+91
-57
lines changed

4 files changed

+91
-57
lines changed

‎api-model-v1-41/build.gradle.kts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import java.util.*
33

44
plugins {
55
id("java")
6-
id("org.jetbrains.kotlin.jvm")
6+
alias(libs.plugins.kotlinJvm)
77
id("com.google.devtools.ksp")
88
id("maven-publish")
99
id("signing")
@@ -108,23 +108,20 @@ repositories {
108108

109109
dependencies {
110110
constraints {
111-
listOf(
112-
"com.squareup.okio:okio",
113-
"com.squareup.okio:okio-jvm"
114-
).forEach {
111+
listOf(libs.bundles.okio).forEach {
115112
implementation(it) {
116113
version {
117-
strictly("[3,4)")
118-
prefer("3.9.1")
114+
strictly(libs.versions.okioVersionrange.get())
115+
prefer(libs.versions.okio.get())
119116
}
120117
}
121118
}
122119
}
123-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0")
120+
implementation(libs.kotlinJdk8)
124121

125-
implementation("com.squareup.moshi:moshi:1.15.2")
126-
ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.2")
127-
compileOnly("com.squareup.okhttp3:okhttp:4.12.0")
122+
implementation(libs.moshi)
123+
ksp("com.squareup.moshi:moshi-kotlin-codegen:${libs.versions.moshi.get()}")
124+
compileOnly(libs.okhttp)
128125

129126
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
130127
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")

‎api-model-v1-45/build.gradle.kts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import java.util.*
33

44
plugins {
55
id("java")
6-
id("org.jetbrains.kotlin.jvm")
6+
alias(libs.plugins.kotlinJvm)
77
id("com.google.devtools.ksp")
88
id("maven-publish")
99
id("signing")
@@ -108,23 +108,20 @@ repositories {
108108

109109
dependencies {
110110
constraints {
111-
listOf(
112-
"com.squareup.okio:okio",
113-
"com.squareup.okio:okio-jvm"
114-
).forEach {
111+
listOf(libs.bundles.okio).forEach {
115112
implementation(it) {
116113
version {
117-
strictly("[3,4)")
118-
prefer("3.9.1")
114+
strictly(libs.versions.okioVersionrange.get())
115+
prefer(libs.versions.okio.get())
119116
}
120117
}
121118
}
122119
}
123-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0")
120+
implementation(libs.kotlinJdk8)
124121

125-
implementation("com.squareup.moshi:moshi:1.15.2")
126-
ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.2")
127-
compileOnly("com.squareup.okhttp3:okhttp:4.12.0")
122+
implementation(libs.moshi)
123+
ksp("com.squareup.moshi:moshi-kotlin-codegen:${libs.versions.moshi.get()}")
124+
compileOnly(libs.okhttp)
128125

129126
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
130127
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")

‎build.gradle.kts‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ import java.util.*
44
rootProject.extra.set("artifactVersion", SimpleDateFormat("yyyy-MM-dd\'T\'HH-mm-ss").format(Date()))
55

66
plugins {
7-
id("maven-publish")
8-
id("com.github.ben-manes.versions") version "0.51.0"
9-
id("net.ossindex.audit") version "0.4.11"
10-
id("io.freefair.maven-central.validate-poms") version "8.11"
11-
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
12-
id("org.jetbrains.kotlin.jvm") version "2.1.0" apply false
13-
id("com.google.devtools.ksp") version "2.1.0-1.0.29" apply false
14-
id("org.openapi.generator") version "7.10.0" apply false
15-
id("org.jlleitschuh.gradle.ktlint") version "12.1.2" apply false
7+
id("maven-publish")
8+
id("com.github.ben-manes.versions") version "0.51.0"
9+
id("net.ossindex.audit") version "0.4.11"
10+
id("io.freefair.maven-central.validate-poms") version "8.11"
11+
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
12+
alias(libs.plugins.kotlinJvm) apply false
13+
id("com.google.devtools.ksp") version "2.1.0-1.0.29" apply false
14+
id("org.openapi.generator") version "7.10.0" apply false
15+
id("org.jlleitschuh.gradle.ktlint") version "12.1.2" apply false
1616
}
1717

1818
val dependencyVersions = listOf(
19-
"org.jetbrains.kotlin:kotlin-reflect:2.1.0",
20-
"org.jetbrains.kotlin:kotlin-script-runtime:2.1.0",
21-
"org.jetbrains.kotlin:kotlin-stdlib:2.1.0",
22-
"org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0",
23-
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0",
24-
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0",
25-
"org.slf4j:slf4j-api:2.0.16",
19+
libs.kotlinReflect,
20+
libs.kotlinScriptRuntime,
21+
libs.kotlinStdlib,
22+
libs.kotlinCommon,
23+
libs.kotlinJdk7,
24+
libs.kotlinJdk8,
25+
libs.slf4j,
2626
)
2727

2828
val dependencyGroupVersions = mapOf<String, String>(
@@ -31,32 +31,32 @@ val dependencyGroupVersions = mapOf<String, String>(
3131
)
3232

3333
subprojects {
34-
configurations.all {
35-
resolutionStrategy {
36-
failOnVersionConflict()
37-
force(dependencyVersions)
38-
eachDependency {
39-
val forcedVersion = dependencyGroupVersions[requested.group]
40-
if (forcedVersion != null) {
41-
useVersion(forcedVersion)
34+
configurations.all {
35+
resolutionStrategy {
36+
failOnVersionConflict()
37+
force(dependencyVersions)
38+
eachDependency {
39+
val forcedVersion = dependencyGroupVersions[requested.group]
40+
if (forcedVersion != null) {
41+
useVersion(forcedVersion)
42+
}
43+
}
4244
}
43-
}
4445
}
45-
}
4646
}
4747

4848
fun findProperty(s: String) = project.findProperty(s) as String?
4949

5050
val isSnapshot = project.version == "unspecified"
5151
nexusPublishing {
52-
repositories {
53-
if (!isSnapshot) {
54-
sonatype {
55-
// 'sonatype' is pre-configured for Sonatype Nexus (OSSRH) which is used for The Central Repository
56-
stagingProfileId.set(System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: findProperty("sonatype.staging.profile.id")) //can reduce execution time by even 10 seconds
57-
username.set(System.getenv("SONATYPE_USERNAME") ?: findProperty("sonatype.username"))
58-
password.set(System.getenv("SONATYPE_PASSWORD") ?: findProperty("sonatype.password"))
59-
}
52+
repositories {
53+
if (!isSnapshot) {
54+
sonatype {
55+
// 'sonatype' is pre-configured for Sonatype Nexus (OSSRH) which is used for The Central Repository
56+
stagingProfileId.set(System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: findProperty("sonatype.staging.profile.id")) //can reduce execution time by even 10 seconds
57+
username.set(System.getenv("SONATYPE_USERNAME") ?: findProperty("sonatype.username"))
58+
password.set(System.getenv("SONATYPE_PASSWORD") ?: findProperty("sonatype.password"))
59+
}
60+
}
6061
}
61-
}
6262
}

‎gradle/libs.versions.toml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[versions]
2+
junitJupiter = "5.11.0"
3+
junitPlatform = "1.11.0"
4+
kotlin = "2.1.0"
5+
kotlinVersionrange = "[1.6,3)"
6+
logback = "1.3.15"
7+
logbackVersionrange = "[1.2,2)"
8+
moshi = "1.15.2"
9+
moshiVersionrange = "[1.12.0,2)"
10+
okhttp = "4.12.0"
11+
okio = "3.10.2"
12+
okioVersionrange = "[3,4)"
13+
slf4j = "2.0.16"
14+
slf4jVersionrange = "[1.7,3)"
15+
16+
[libraries]
17+
kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
18+
kotlinCommon = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version.ref = "kotlin" }
19+
kotlinJdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
20+
kotlinJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
21+
kotlinReflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
22+
kotlinScriptRuntime = { module = "org.jetbrains.kotlin:kotlin-script-runtime", version.ref = "kotlin" }
23+
kotlinScriptingJvm = { module = "org.jetbrains.kotlin:kotlin-scripting-jvm", version.ref = "kotlin" }
24+
kotlinStdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
25+
kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
26+
logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
27+
moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
28+
moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
29+
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
30+
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
31+
okioJvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
32+
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
33+
34+
[bundles]
35+
kotlin = ["kotlin", "kotlinCommon", "kotlinJdk7", "kotlinJdk8", "kotlinReflect", "kotlinScriptingJvm", "kotlinStdlib", "kotlinTest"]
36+
moshi = ["moshi", "moshiKotlin"]
37+
okio = ["okio", "okioJvm"]
38+
39+
[plugins]
40+
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

0 commit comments

Comments
 (0)