Skip to content

Commit

Permalink
[Gradle] Simplify version management.
Browse files Browse the repository at this point in the history
  • Loading branch information
vyazelenko committed Sep 13, 2024
1 parent c68bb1a commit 9735ec5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 18 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ allprojects {
resolutionStrategy {
failOnVersionConflict()

force "junit:junit:${libs.versions.junit4.get()}",
"net.bytebuddy:byte-buddy:${libs.versions.byteBuddy.get()}",
"net.bytebuddy:byte-buddy-agent:${libs.versions.byteBuddy.get()}",
force libs.junit4,
libs.byteBuddy,
libs.byteBuddy.agent,
// patching conflicting Checkstyle dependencies
"org.codehaus.plexus:plexus-utils:3.3.0",
"org.apache.commons:commons-lang3:3.8.1",
Expand Down Expand Up @@ -370,8 +370,8 @@ project(':agrona-agent') {
dependencies {
implementation project(':agrona')
implementation libs.byteBuddy
compileOnly libs.findbugs.annotations
testCompileOnly libs.findbugs.annotations
compileOnly libs.findbugs
testCompileOnly libs.findbugs
testImplementation platform("org.junit:junit-bom:${libs.versions.junit5.get()}")
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ repositories {

dependencies {
implementation libs.byteBuddy.gradle.plugin
compileOnly libs.findbugs.annotations
compileOnly libs.findbugs
}
18 changes: 6 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
[versions]
byteBuddy = "1.15.1"
findbugs = "3.0.1"
checkstyle = "10.18.1"
hamcrest = "3.0"
mockito = "5.13.0"
guava = "33.3.0-jre"
junit4 = "4.13.2"
junit5 = "5.11.0"
jmh = "1.37"
jcstress = "0.16"

[libraries]
junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
guava = { group = "com.google.guava", name = "guava-testlib", version.ref = "guava" }
mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
findbugs-annotations = { group = "com.google.code.findbugs", name = "findbugs-annotations", version.ref = "findbugs" }
junit4 = { group = "junit", name = "junit", version = "4.13.2" }
guava = { group = "com.google.guava", name = "guava-testlib", version = "33.3.0-jre" }
mockito = { group = "org.mockito", name = "mockito-core", version = "5.13.0" }
hamcrest = { group = "org.hamcrest", name = "hamcrest", version = "3.0" }
findbugs = { group = "com.google.code.findbugs", name = "findbugs-annotations", version = "3.0.1" }
byteBuddy = { group = "net.bytebuddy", name = "byte-buddy", version.ref = "byteBuddy" }
byteBuddy-agent = { group = "net.bytebuddy", name = "byte-buddy-agent", version.ref = "byteBuddy" }
byteBuddy-gradle-plugin = { group = "net.bytebuddy", name = "byte-buddy-gradle-plugin", version.ref = "byteBuddy" }
jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }
jcstress-core = { group = "org.openjdk.jcstress", name = "jcstress-core", version.ref = "jcstress" }
jcstress-core = { group = "org.openjdk.jcstress", name = "jcstress-core", version = "0.16" }

[plugins]
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
Expand Down

0 comments on commit 9735ec5

Please sign in to comment.