Skip to content

Commit 2d36ca7

Browse files
PerfectSlayerPerfectSlayer
authored
Merge pull request #7230 from DataDog/bbujon/lib-catalog
Move to Gradle version catalog
2 parents 46c883a + cb08639 commit 2d36ca7

112 files changed

Lines changed: 392 additions & 395 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎communication/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
apply from: "$rootDir/gradle/java.gradle"
22

33
dependencies {
4-
implementation deps.slf4j
4+
implementation libs.slf4j
55

66
api project(':remote-config')
77
implementation project(':internal-api')
88
implementation project(':utils:container-utils')
99
implementation project(':utils:socket-utils')
1010
implementation project(':utils:version-utils')
1111

12-
api deps.okio
13-
api deps.okhttp
14-
api group: 'com.squareup.moshi', name: 'moshi', version: versions.moshi
15-
implementation group: 'com.datadoghq', name: 'java-dogstatsd-client', version: "${versions.dogstatsd}"
12+
api libs.okio
13+
api libs.okhttp
14+
api libs.moshi
15+
implementation libs.dogstatsd
1616

1717
testImplementation project(':utils:test-utils')
18-
testImplementation deps.junit5
19-
testImplementation deps.truth
20-
testImplementation deps.bytebuddy
18+
testImplementation libs.bundles.junit5
19+
testImplementation libs.truth
20+
testImplementation libs.bytebuddy
2121
testImplementation group: 'org.msgpack', name: 'msgpack-core', version: '0.8.20'
2222
testImplementation group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.20'
23-
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
23+
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
2424
}
2525

2626
ext {

‎dd-java-agent/agent-bootstrap/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
api project(':internal-api')
2222
api project(':internal-api:internal-api-9')
2323
api project(':dd-java-agent:agent-logging')
24-
api deps.slf4j
24+
api libs.slf4j
2525
// ^ Generally a bad idea for libraries, but we're shadowing.
2626

2727
testImplementation project(':dd-java-agent:testing')

‎dd-java-agent/agent-ci-visibility/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ minimumBranchCoverage = 0.0
1010
minimumInstructionCoverage = 0.0
1111

1212
dependencies {
13-
api deps.slf4j
13+
api libs.slf4j
1414

15-
implementation deps.asm
16-
implementation deps.asmcommons
15+
implementation libs.bundles.asm
1716
implementation group: 'org.jacoco', name: 'org.jacoco.core', version: '0.8.9'
1817
implementation group: 'org.jacoco', name: 'org.jacoco.report', version: '0.8.9'
1918

‎dd-java-agent/agent-crashtracking/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ tasks.withType(Test).configureEach { subTask ->
1212
}
1313

1414
dependencies {
15-
implementation deps.slf4j
15+
implementation libs.slf4j
1616
implementation project(':communication')
1717
implementation project(':internal-api')
1818
implementation project(':utils:container-utils')
1919
implementation project(':utils:version-utils')
2020

21-
implementation deps.okhttp
22-
implementation group: 'com.squareup.moshi', name: 'moshi', version: versions.moshi
21+
implementation libs.okhttp
22+
implementation libs.moshi
2323

24-
testImplementation deps.junit5
25-
testImplementation deps.mockito
26-
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
27-
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
24+
testImplementation libs.bundles.junit5
25+
testImplementation libs.bundles.mockito
26+
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
27+
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
2828
}
2929

‎dd-java-agent/agent-debugger/build.gradle‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,27 @@ excludedClassesCoverage += [
2727
dependencies {
2828
// main dependencies
2929
implementation project(':utils:container-utils')
30-
implementation deps.slf4j
31-
implementation deps.asm
32-
implementation deps.asmcommons
30+
implementation libs.slf4j
31+
implementation libs.bundles.asm
3332
implementation project(':internal-api')
3433
implementation project(':communication')
3534
compileOnly project(':dd-java-agent:agent-tooling')
3635
compileOnly project(':dd-java-agent:agent-builder')
3736
compileOnly project(':dd-trace-core')
3837
implementation project(':dd-java-agent:agent-debugger:debugger-el')
3938
implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
40-
implementation deps.okhttp
41-
implementation deps.dogstatsd
42-
implementation deps.moshi
39+
implementation libs.okhttp
40+
implementation libs.dogstatsd
41+
implementation libs.moshi
4342

44-
testImplementation deps.junit5
45-
testImplementation group: 'org.ow2.asm', name: 'asm-util', version: versions.asm
46-
testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: "${versions.junit5}"
43+
testImplementation libs.bundles.junit5
44+
testImplementation group: 'org.ow2.asm', name: 'asm-util', version: libs.versions.asm.get()
45+
testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: libs.versions.junit5.get()
4746
testImplementation project(':dd-java-agent:agent-debugger:debugger-test-scala')
4847
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.7.0")
49-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit5}")
50-
testImplementation deps.mockito
51-
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
48+
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: libs.versions.junit5.get()
49+
testImplementation libs.bundles.mockito
50+
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
5251
testImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '2.3.5.RELEASE'
5352
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.3.5.RELEASE'
5453
testImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.30'
@@ -57,7 +56,7 @@ dependencies {
5756
testImplementation project(':dd-trace-core')
5857
testImplementation project(':dd-java-agent:agent-builder')
5958
testImplementation project(':utils:test-utils')
60-
testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: versions.scala213
59+
testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: libs.versions.scala213.get()
6160
testRuntimeOnly group: 'antlr', name: 'antlr', version: '2.7.7'
6261
}
6362

‎dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ minimumInstructionCoverage = 0.0
99
minimumBranchCoverage = 0.0
1010

1111
dependencies {
12-
implementation deps.slf4j
12+
implementation libs.slf4j
1313
implementation project(':internal-api')
1414
}

‎dd-java-agent/agent-debugger/debugger-el/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ excludedClassesCoverage += [
1818
dependencies {
1919
implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
2020

21-
implementation deps.slf4j
22-
implementation deps.moshi
23-
testImplementation deps.junit5
21+
implementation libs.slf4j
22+
implementation libs.moshi
23+
testImplementation libs.bundles.junit5
2424
testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.1")
25-
testImplementation deps.mockito
25+
testImplementation libs.bundles.mockito
2626
testImplementation project(':internal-api')
2727
}

‎dd-java-agent/agent-iast/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ protobuf {
4242
}
4343

4444
dependencies {
45-
api deps.slf4j
45+
api libs.slf4j
4646

4747
compileOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
4848
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
4949

5050
implementation project(':internal-api')
5151
implementation project(':internal-api:internal-api-9')
52-
implementation group: 'com.squareup.moshi', name: 'moshi', version: versions.moshi
52+
implementation libs.moshi
5353

5454
testFixturesApi project(':dd-java-agent:testing')
5555
testFixturesApi project(':utils:test-utils')
56-
testImplementation deps.bytebuddy
56+
testImplementation libs.bytebuddy
5757
testImplementation('org.skyscreamer:jsonassert:1.5.1')
5858
testImplementation('org.codehaus.groovy:groovy-yaml:3.0.17')
5959

‎dd-java-agent/agent-jmxfetch/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
1919
exclude group: 'com.fasterxml.jackson.jr', module: 'jackson-jr-objects'
2020
}
21-
api deps.slf4j
21+
api libs.slf4j
2222
api project(':internal-api')
2323
}
2424

‎dd-java-agent/agent-logging/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ excludedClassesCoverage += [
1919

2020
dependencies {
2121
// This is fine since this project is shadowed into the agent-jar by dd-java-agent:agent-bootstrap
22-
api group: 'org.slf4j', name: 'slf4j-api', version: versions.slf4j
22+
api libs.slf4j
2323
api project(':internal-api')
2424
}

0 commit comments

Comments
 (0)