Skip to content

Commit e80cb0b

Browse files
committedFeb 5, 2025
Gradle updated to use libs.versions.toml
JAVA-5291
1 parent bedcdae commit e80cb0b

File tree

15 files changed

+326
-221
lines changed

15 files changed

+326
-221
lines changed
 

‎bson-kotlin/build.gradle.kts

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1818

1919
plugins {
2020
id("org.jetbrains.kotlin.jvm")
21-
`java-library`
21+
id("java-library")
2222

2323
// Test based plugins
24-
id("com.diffplug.spotless")
25-
id("org.jetbrains.dokka")
26-
id("io.gitlab.arturbosch.detekt")
24+
alias(libs.plugins.spotless)
25+
alias(libs.plugins.dokka)
26+
alias(libs.plugins.detekt)
2727
}
2828

2929
repositories {
@@ -39,13 +39,13 @@ ext.set("pomName", "Bson Kotlin")
3939

4040
dependencies {
4141
// Align versions of all Kotlin components
42-
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
43-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
42+
implementation(platform(libs.kotlin.bom))
43+
implementation(libs.kotlin.stdlib.jdk8)
4444

4545
api(project(path = ":bson", configuration = "default"))
46-
implementation("org.jetbrains.kotlin:kotlin-reflect")
46+
implementation(libs.kotlin.reflect)
4747

48-
testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
48+
testImplementation(libs.junit.kotlin)
4949
testImplementation(project(path = ":driver-core", configuration = "default"))
5050
}
5151

‎bson-kotlinx/build.gradle.kts

+14-18
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1919
plugins {
2020
id("org.jetbrains.kotlin.jvm")
2121
kotlin("plugin.serialization")
22-
`java-library`
22+
id("java-library")
2323

2424
// Test based plugins
25-
id("com.diffplug.spotless")
26-
id("org.jetbrains.dokka")
27-
id("io.gitlab.arturbosch.detekt")
25+
alias(libs.plugins.spotless)
26+
alias(libs.plugins.dokka)
27+
alias(libs.plugins.detekt)
2828
}
2929

3030
repositories {
@@ -38,32 +38,28 @@ description = "Bson Kotlinx Codecs"
3838

3939
ext.set("pomName", "Bson Kotlinx")
4040

41-
ext.set("kotlinxDatetimeVersion", "0.4.0")
42-
43-
val kotlinxDatetimeVersion: String by ext
44-
4541
java {
4642
registerFeature("dateTimeSupport") { usingSourceSet(sourceSets["main"]) }
4743
registerFeature("jsonSupport") { usingSourceSet(sourceSets["main"]) }
4844
}
4945

5046
dependencies {
5147
// Align versions of all Kotlin components
52-
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
53-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
48+
implementation(platform(libs.kotlin.bom))
49+
implementation(libs.kotlin.stdlib.jdk8)
5450

55-
implementation(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.0"))
56-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core")
57-
"dateTimeSupportImplementation"("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDatetimeVersion")
58-
"jsonSupportImplementation"("org.jetbrains.kotlinx:kotlinx-serialization-json")
51+
implementation(platform(libs.kotlinx.serialization))
52+
implementation(libs.kotlinx.serialization.core)
53+
"dateTimeSupportImplementation"(libs.kotlinx.serialization.datetime)
54+
"jsonSupportImplementation"(libs.kotlinx.serialization.json)
5955

6056
api(project(path = ":bson", configuration = "default"))
61-
implementation("org.jetbrains.kotlin:kotlin-reflect")
57+
implementation(libs.kotlin.reflect)
6258

63-
testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
6459
testImplementation(project(path = ":driver-core", configuration = "default"))
65-
testImplementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDatetimeVersion")
66-
testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json")
60+
testImplementation(libs.junit.kotlin)
61+
testImplementation(libs.kotlinx.serialization.datetime)
62+
testImplementation(libs.kotlinx.serialization.json)
6763
}
6864

6965
kotlin { explicitApi() }

‎build.gradle

+38-73
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,21 @@
1414
* limitations under the License.
1515
*/
1616

17-
apply plugin: 'eclipse'
18-
apply plugin: 'idea'
19-
20-
buildscript {
21-
repositories {
22-
mavenLocal()
23-
mavenCentral()
24-
maven { url "https://plugins.gradle.org/m2/" }
25-
}
26-
dependencies {
27-
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
28-
classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.15"
29-
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2'
30-
31-
// Scala plugins
32-
classpath "com.adtran:scala-multiversion-plugin:2.0.4"
33-
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.14.0"
34-
35-
// kotlin plugins
36-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
37-
classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.10"
38-
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.10"
39-
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0"
40-
41-
// Test logging plugin
42-
classpath 'com.adarshr:gradle-test-logger-plugin:2.1.0'
43-
}
17+
plugins {
18+
id("eclipse")
19+
id("idea")
20+
21+
alias(libs.plugins.bnd) apply false
22+
alias(libs.plugins.detekt) apply false
23+
alias(libs.plugins.dokka) apply false
24+
alias(libs.plugins.download) apply false
25+
alias(libs.plugins.kotlin) apply false
26+
alias(libs.plugins.kotlin.serialization) apply false
27+
alias(libs.plugins.optional) apply false
28+
alias(libs.plugins.scala.multiversion) apply false
29+
alias(libs.plugins.spotbugs) apply false
30+
alias(libs.plugins.spotless) apply false
31+
alias(libs.plugins.test.logger) apply false
4432
}
4533

4634
//////////////////////////////////////////
@@ -49,17 +37,6 @@ buildscript {
4937

5038
ext {
5139
configDir = new File(rootDir, 'config')
52-
jnrUnixsocketVersion = '0.38.17'
53-
nettyVersion = '4.1.87.Final'
54-
snappyVersion = '1.1.10.3'
55-
zstdVersion = '1.5.5-3'
56-
awsSdkV2Version = '2.18.9'
57-
awsSdkV1Version = '1.12.337'
58-
projectReactorVersion = '2022.0.0'
59-
junitBomVersion = '5.10.2'
60-
logbackVersion = '1.3.14'
61-
graalSdkVersion = '24.0.0'
62-
reflectionsVersion = '0.9.10'
6340
gitVersion = getGitVersion()
6441
}
6542

@@ -109,27 +86,21 @@ configure(javaProjects) {
10986
}
11087

11188
configure(scalaProjects) {
112-
apply plugin: 'scala'
113-
apply plugin: 'java-library'
114-
apply plugin: 'idea'
89+
apply plugin: "java-library"
90+
apply plugin: "scala"
11591
apply plugin: "com.adtran.scala-multiversion-plugin"
11692
apply plugin: "com.diffplug.spotless"
11793

11894
group = 'org.mongodb.scala'
11995

12096
dependencies {
121-
api ('org.scala-lang:scala-library:%scala-version%')
122-
api ('org.scala-lang:scala-reflect:%scala-version%')
123-
124-
testImplementation(platform("org.junit:junit-bom:$junitBomVersion"))
125-
testImplementation("org.junit.vintage:junit-vintage-engine")
126-
127-
testImplementation('org.scalatest:scalatest-flatspec_%%:3.2.9')
128-
testImplementation('org.scalatest:scalatest-shouldmatchers_%%:3.2.9')
129-
testImplementation('org.scalatestplus:junit-4-13_%%:3.2.9.0')
130-
testImplementation('org.scalatestplus:mockito-3-12_%%:3.2.10.0')
131-
testImplementation("ch.qos.logback:logback-classic:$logbackVersion")
132-
testImplementation("org.reflections:reflections:$reflectionsVersion")
97+
api(libs.scala.library)
98+
api(libs.scala.reflect)
99+
100+
testImplementation(platform(libs.junit.bom))
101+
testImplementation(libs.bundles.junit.vintage)
102+
testImplementation(libs.bundles.scalatest)
103+
testImplementation(libs.reflections)
133104
}
134105

135106
test{
@@ -177,12 +148,12 @@ configure(javaMainProjects) {
177148
apply plugin: 'java-library'
178149

179150
dependencies {
180-
compileOnly 'com.google.code.findbugs:jsr305:1.3.9'
181-
api 'org.slf4j:slf4j-api:1.7.6', optional
182-
testImplementation 'com.google.code.findbugs:jsr305:1.3.9'
151+
compileOnly(libs.findbugs.jsr)
152+
api(libs.slf4j, optional)
183153

154+
testImplementation(libs.findbugs.jsr)
184155
// https://issues.apache.org/jira/browse/GROOVY-10194
185-
testImplementation 'org.codehaus.groovy:groovy-all:3.0.9'
156+
testImplementation(libs.groovy)
186157
}
187158

188159
/* Compiling */
@@ -251,25 +222,19 @@ configure(javaCodeCheckedProjects) {
251222
apply plugin: 'com.adarshr.test-logger'
252223

253224
dependencies {
254-
testImplementation(platform("org.junit:junit-bom:$junitBomVersion"))
255-
testImplementation('org.junit.jupiter:junit-jupiter')
256-
testImplementation('org.junit.jupiter:junit-jupiter-params')
257-
testImplementation('org.junit.jupiter:junit-jupiter-engine')
258-
testImplementation('org.junit.vintage:junit-vintage-engine')
259-
260-
testImplementation platform('org.spockframework:spock-bom:2.1-groovy-3.0')
261-
testImplementation 'org.spockframework:spock-core'
262-
testImplementation 'org.spockframework:spock-junit4'
225+
testImplementation(platform(libs.junit.bom))
226+
testImplementation(libs.bundles.junit.vintage)
227+
228+
testImplementation(platform(libs.spock.bom))
229+
testImplementation(libs.bundles.spock)
230+
263231
if ('8'.equals(findProperty("javaVersion"))) {
264-
testImplementation("org.mockito:mockito-core:4.6.1")
265-
testImplementation("org.mockito:mockito-inline:4.6.1")
232+
testImplementation(libs.bundles.mockito.java8)
266233
} else {
267-
testImplementation("org.mockito:mockito-core:5.11.0")
234+
testImplementation(libs.bundles.mockito)
268235
}
269-
testImplementation 'cglib:cglib-nodep:2.2.2'
270-
testImplementation 'org.objenesis:objenesis:1.3'
271-
testImplementation 'org.hamcrest:hamcrest-all:1.3'
272-
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
236+
testImplementation(libs.cglib)
237+
testImplementation(libs.objenesis)
273238
testImplementation project(':util:spock') //Adding categories to classpath
274239
}
275240

‎driver-benchmarks/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ sourceSets {
3232
dependencies {
3333
api project(':driver-sync')
3434
api project(':mongodb-crypt')
35-
implementation "ch.qos.logback:logback-classic:$logbackVersion"
35+
implementation(libs.logback.classic)
3636
}
3737

3838
javadoc {

‎driver-core/build.gradle

+16-21
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
plugins {
19-
id 'com.github.gmazzo.buildconfig' version '3.0.3'
19+
alias(libs.plugins.build.config)
2020
}
2121

2222
archivesBaseName = 'mongodb-driver-core'
@@ -33,38 +33,33 @@ configurations {
3333
}
3434
}
3535

36-
def classifiers = ["linux-x86_64", "linux-aarch_64", "osx-x86_64", "osx-aarch_64", "windows-x86_64"]
3736
dependencies {
3837
api project(path: ':bson', configuration: 'default')
3938
implementation project(path: ':bson-record-codec', configuration: 'default')
4039
implementation project(path: ':bson-kotlin', configuration: 'default'), optional
4140
implementation project(path: ':bson-kotlinx', configuration: 'default'), optional
4241
implementation project(path: ':mongodb-crypt', configuration: 'default'), optional
4342

44-
implementation "com.github.jnr:jnr-unixsocket:$jnrUnixsocketVersion", optional
45-
api platform("io.netty:netty-bom:$nettyVersion")
46-
api "io.netty:netty-buffer", optional
47-
api "io.netty:netty-transport", optional
48-
api "io.netty:netty-handler", optional
49-
compileOnly "org.graalvm.sdk:graal-sdk:$graalSdkVersion"
43+
implementation(libs.jnr.unixsocket, optional)
44+
api(platform(libs.netty.bom), optional)
45+
api(libs.bundles.netty, optional)
46+
compileOnly(libs.graal.sdk)
5047

51-
// Optionally depend on both AWS SDK v2 and v1. The driver will use v2 is present, v1 if present, or built-in functionality if
52-
// neither are present
53-
implementation "software.amazon.awssdk:auth:$awsSdkV2Version", optional
54-
implementation "software.amazon.awssdk:sts:$awsSdkV2Version", optional
55-
implementation "com.amazonaws:aws-java-sdk-core:$awsSdkV1Version", optional
56-
implementation "com.amazonaws:aws-java-sdk-sts:$awsSdkV1Version", optional
48+
// Optionally depend on both AWS SDK v2 and v1.
49+
// The driver will use v2 is present, v1 if present, or built-in functionality if neither are present
50+
implementation(libs.bundles.aws.java.sdk.v1, optional)
51+
implementation(libs.bundles.aws.java.sdk.v2, optional)
5752

58-
implementation "org.xerial.snappy:snappy-java:$snappyVersion", optional
59-
implementation "com.github.luben:zstd-jni:$zstdVersion", optional
53+
implementation(libs.snappy.java, optional)
54+
implementation(libs.zstd.jni, optional)
6055

6156
testImplementation project(':bson').sourceSets.test.output
62-
testImplementation('org.junit.jupiter:junit-jupiter-api')
63-
testImplementation("org.reflections:reflections:$reflectionsVersion")
64-
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static"
57+
testImplementation(libs.bundles.junit)
58+
testImplementation(libs.reflections)
6559

66-
classifiers.forEach {
67-
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static::$it"
60+
testRuntimeOnly(libs.netty.boringssl)
61+
["linux-x86_64", "linux-aarch_64", "osx-x86_64", "osx-aarch_64", "windows-x86_64"].each { arch ->
62+
testRuntimeOnly(variantOf(libs.netty.boringssl) { classifier(arch) })
6863
}
6964
}
7065

‎driver-kotlin-coroutine/build.gradle.kts

+16-17
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1818

1919
plugins {
2020
id("org.jetbrains.kotlin.jvm")
21-
`java-library`
21+
id("java-library")
2222

2323
// Test based plugins
24-
id("com.diffplug.spotless")
25-
id("org.jetbrains.dokka")
26-
id("io.gitlab.arturbosch.detekt")
24+
alias(libs.plugins.spotless)
25+
alias(libs.plugins.dokka)
26+
alias(libs.plugins.detekt)
2727
}
2828

2929
repositories {
@@ -56,26 +56,25 @@ val integrationTestImplementation: Configuration by
5656

5757
dependencies {
5858
// Align versions of all Kotlin components
59-
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
60-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
59+
implementation(platform(libs.kotlin.bom))
60+
implementation(libs.kotlin.stdlib.jdk8)
6161

62-
implementation(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
63-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
64-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive")
62+
implementation(platform(libs.kotlinx.coroutines.bom))
63+
api(libs.kotlinx.coroutines.core)
64+
implementation(libs.kotlinx.coroutines.reactive)
6565

6666
api(project(path = ":bson", configuration = "default"))
6767
api(project(path = ":driver-reactive-streams", configuration = "default"))
6868
implementation(project(path = ":bson-kotlin", configuration = "default"))
6969

70-
testImplementation("org.jetbrains.kotlin:kotlin-reflect")
71-
testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
72-
testImplementation("org.mockito.kotlin:mockito-kotlin:4.1.0")
73-
testImplementation("org.mockito:mockito-junit-jupiter:4.11.0")
74-
testImplementation("org.assertj:assertj-core:3.24.2")
75-
testImplementation("io.github.classgraph:classgraph:4.8.154")
70+
testImplementation(libs.kotlin.reflect)
71+
testImplementation(libs.junit.kotlin)
72+
testImplementation(libs.bundles.mockito.kotlin)
73+
testImplementation(libs.assertj)
74+
testImplementation(libs.classgraph)
7675

77-
integrationTestImplementation("org.jetbrains.kotlin:kotlin-test-junit")
78-
integrationTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test")
76+
integrationTestImplementation(libs.junit.kotlin)
77+
integrationTestImplementation(libs.kotlinx.coroutines.test)
7978
integrationTestImplementation(project(path = ":driver-sync"))
8079
integrationTestImplementation(project(path = ":driver-core"))
8180
integrationTestImplementation(project(path = ":bson"))

0 commit comments

Comments
 (0)
Failed to load comments.