Skip to content

Commit 80074b5

Browse files
committed
Use version catalog
1 parent 789d2e6 commit 80074b5

File tree

4 files changed

+82
-34
lines changed

4 files changed

+82
-34
lines changed

autobot/build.gradle.kts

+29-29
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@ fun String.runCommand(currentWorkingDir: File = file("./")): String {
3030
buildscript {
3131
dependencies {
3232
listOf(
33-
"com.squareup.okhttp3:okhttp:${project.property("okhttp3.version")}",
34-
"com.google.guava:guava:${project.property("guava.version")}",
35-
"com.google.googlejavaformat:google-java-format:${project.property("google-java-format.version")}",
36-
"org.yaml:snakeyaml:${project.property("snakeyaml.version")}"
33+
libs.okhttp3,
34+
libs.guava,
35+
libs.google.java.format,
36+
libs.snakeyaml
3737
).forEach { classpath(it) }
3838
}
3939
}
4040

4141
plugins {
4242
id("java")
43-
id("com.heroku.sdk.heroku-gradle") version "2.0.0"
44-
id("io.spring.dependency-management") version "1.1.0"
45-
id("org.springframework.boot") version "3.1.0"
46-
id("com.gorylenko.gradle-git-properties") version "2.4.1"
43+
alias(libs.plugins.heroku.gradle)
44+
alias(libs.plugins.spring.dependency.management)
45+
alias(libs.plugins.spring.boot)
46+
alias(libs.plugins.gradle.git.properties)
4747
id("checkstyle")
4848
id("pmd")
49-
id("com.github.spotbugs") version "5.0.13"
49+
alias(libs.plugins.spotbugs.gradle)
5050
id("jacoco")
51-
id("com.github.ben-manes.versions") version "0.44.0"
52-
id("ca.cutterslade.analyze")
53-
id("com.bmuschko.docker-remote-api") version "9.0.1"
51+
alias(libs.plugins.versions.gradle)
52+
alias(libs.plugins.ca.cutterslade.analyze)
53+
alias(libs.plugins.docker.gradle)
5454
}
5555

5656
java {
@@ -78,48 +78,48 @@ configurations["intTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get(
7878

7979
checkstyle {
8080
configFile = project.file("config/checkstyle/checkstyle.xml")
81-
toolVersion = project.property("checkstyle.version").toString()
81+
toolVersion = libs.versions.checkstyle.get()
8282
}
8383

8484
jacoco {
85-
toolVersion = project.property("jacoco.version").toString()
85+
toolVersion = libs.versions.jacoco.get()
8686
}
8787

8888
pmd {
8989
isConsoleOutput = true
9090
isIgnoreFailures = false
9191
ruleSets = listOf()
9292
ruleSetFiles = files("config/pmd/pmd.xml")
93-
toolVersion = project.property("pmd.version").toString()
93+
toolVersion = libs.versions.pmd.get()
9494
}
9595

9696
spotbugs {
9797
ignoreFailures.set(false)
9898
setEffort("max")
9999
setReportLevel("low")
100100
showProgress.set(false)
101-
toolVersion.set(project.property("spotbugs.version").toString())
101+
toolVersion.set(libs.versions.spotbugs.get())
102102
}
103103

104104
// Project Dependencies
105105
dependencies {
106106
listOf(
107-
"com.newrelic.agent.java:newrelic-agent:${project.property("newrelic.version")}"
107+
libs.newrelic.agent
108108
).forEach { agent(it) }
109109

110110
listOf(
111-
"com.github.spotbugs:spotbugs:${project.property("spotbugs.version")}"
111+
libs.spotbugs
112112
).forEach { spotbugs(it) }
113113

114114
listOf(
115-
"com.github.spotbugs:spotbugs-annotations:${project.property("spotbugs.version")}",
115+
libs.spotbugs.annotations,
116116
"com.fasterxml.jackson.core:jackson-annotations",
117117
"com.fasterxml.jackson.core:jackson-core",
118118
"com.fasterxml.jackson.core:jackson-databind",
119-
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${project.property("jackson-datatype-jsr310.version")}",
120-
"com.google.guava:guava:${project.property("guava.version")}",
121-
"com.newrelic.agent.java:newrelic-api:${project.property("newrelic.version")}",
122-
"com.newrelic.telemetry:micrometer-registry-new-relic:${project.property("micrometer-registry-new-relic.version")}",
119+
libs.jackson.datatype.jsr310,
120+
libs.guava,
121+
libs.newrelic.api,
122+
libs.micrometer.registry.new.relic,
123123
"io.micrometer:micrometer-core",
124124
"io.projectreactor:reactor-core",
125125
"org.slf4j:slf4j-api",
@@ -140,12 +140,12 @@ dependencies {
140140
"org.springframework.security:spring-security-config",
141141
"org.thymeleaf:thymeleaf",
142142
"org.thymeleaf:thymeleaf-spring6",
143-
"com.github.scribejava:scribejava-core:${project.property("scribejava-core.version")}",
144-
"com.twitter:twitter-api-java-sdk:${project.property("twitter-api-java-sdk.version")}"
143+
libs.scribe.java,
144+
libs.twitter.api.java.sdk
145145
).forEach { implementation(it) }
146146

147147
listOf(
148-
"org.springframework.boot:spring-boot-properties-migrator"
148+
"org.springframework.boot:spring-boot-properties-migrator"
149149
).forEach { runtimeOnly(it) }
150150

151151
listOf(
@@ -162,7 +162,7 @@ dependencies {
162162
}
163163

164164
listOf(
165-
"commons-io:commons-io:${project.property("commons-io.version")}",
165+
libs.commons.io,
166166
"com.github.tomakehurst:wiremock-jre8-standalone",
167167
"org.apache.httpcomponents:httpclient",
168168
"org.apache.httpcomponents:httpcore",
@@ -173,8 +173,8 @@ dependencies {
173173
"org.junit.jupiter:junit-jupiter-api",
174174
"org.junit.jupiter:junit-jupiter-params",
175175
"org.junit.platform:junit-platform-commons",
176-
"org.springframework.cloud:spring-cloud-starter-contract-stub-runner:${project.property("spring-cloud-starter-contract-stub-runner.version")}",
177-
"org.mockito:mockito-core:${project.property("mockito-core.version")}"
176+
libs.spring.cloud.starter.contract.stub.runner,
177+
libs.mockito.core
178178
).forEach {
179179
testImplementation(it)
180180
}

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import java.io.ByteArrayOutputStream
22

33
plugins {
4-
id("ca.cutterslade.analyze") version "1.9.0"
4+
alias(libs.plugins.ca.cutterslade.analyze)
55
}
66

77
allprojects {

gradle/libs.versions.toml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
[versions]
2+
checkstyle = "10.9.2"
3+
commons-io = "2.11.0"
4+
google-java-format = "1.16.0"
5+
guava = "31.1-jre"
6+
jackson-datatype-jsr310 = "2.15.1"
7+
jacoco = "0.8.8"
8+
micrometer-registry-new-relic = "0.10.0"
9+
mockito-core = "5.3.1"
10+
newrelic = "8.0.1"
11+
node = "20.2.0"
12+
okhttp3 = "4.11.0"
13+
pmd = "6.55.0"
14+
scribejava-core = "8.3.3"
15+
snakeyaml = "2.0"
16+
spotbugs = "4.7.3"
17+
spring-cloud-starter-contract-stub-runner = "4.0.1"
18+
twitter-api-java-sdk = "2.0.3"
19+
20+
[libraries]
21+
commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
22+
google-java-format = { module = "com.google.googlejavaformat:google-java-format", version.ref = "google-java-format"}
23+
guava = { module = "com.google.guava:guava", version.ref = "guava"}
24+
jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson-datatype-jsr310" }
25+
micrometer-registry-new-relic = { module = "com.newrelic.telemetry:micrometer-registry-new-relic", version.ref = "micrometer-registry-new-relic" }
26+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito-core" }
27+
newrelic-api = { module = "com.newrelic.agent.java:newrelic-api", version.ref = "newrelic" }
28+
newrelic-agent = { module = "com.newrelic.agent.java:newrelic-agent", version.ref = "newrelic" }
29+
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" }
30+
scribe-java = { module = "com.github.scribejava:scribejava-core", version.ref = "scribejava-core" }
31+
snakeyaml = { module = "org.yaml:snakeyaml", version.ref = "snakeyaml" }
32+
spotbugs = { module = "com.github.spotbugs:spotbugs", version.ref = "spotbugs" }
33+
spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs" }
34+
spring-cloud-starter-contract-stub-runner = { module = "org.springframework.cloud:spring-cloud-starter-contract-stub-runner", version.ref = "spring-cloud-starter-contract-stub-runner" }
35+
twitter-api-java-sdk = { module = "com.twitter:twitter-api-java-sdk", version.ref = "twitter-api-java-sdk" }
36+
37+
[plugins]
38+
ca-cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.9.0" }
39+
docker-gradle = { id = "com.bmuschko.docker-remote-api", version = "9.0.1" }
40+
git-publish = { id = "org.ajoberstar.git-publish", version = "4.1.1" }
41+
gradle-git-properties = { id = "com.gorylenko.gradle-git-properties", version = "2.4.1" }
42+
heroku-gradle = { id = "com.heroku.sdk.heroku-gradle", version = "2.0.0" }
43+
node-gradle = { id = "com.github.node-gradle.node", version = "3.5.1" }
44+
spotbugs-gradle = { id = "com.github.spotbugs", version = "5.0.13" }
45+
spotless = { id = "com.diffplug.spotless", version = "6.17.0" }
46+
spring-boot = { id = "org.springframework.boot", version = "3.1.0" }
47+
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.0" }
48+
versions-gradle = { id = "com.github.ben-manes.versions", version = "0.44.0" }

web/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("EEEE, MMMM dd, y
66
val updatedAt: String = LocalDate.now().format(formatter)
77

88
plugins {
9-
id("com.diffplug.spotless") version "6.17.0"
10-
id("com.github.node-gradle.node") version "3.5.1"
11-
id("org.ajoberstar.git-publish") version "4.1.1"
9+
alias(libs.plugins.spotless)
10+
alias(libs.plugins.node.gradle)
11+
alias(libs.plugins.git.publish)
1212
}
1313

1414
gitPublish {
@@ -50,7 +50,7 @@ gitPublish {
5050
}
5151

5252
node {
53-
version.set(project.property("node.version").toString())
53+
version.set(libs.versions.node.get())
5454
}
5555

5656
spotless {

0 commit comments

Comments
 (0)