Skip to content

Commit 8e7b437

Browse files
authored
Move build versions to catalog (#1754)
Move build versions to a version catalog so that they're properly picked up by Dependabot.
1 parent ce9b6aa commit 8e7b437

File tree

2 files changed

+38
-20
lines changed

2 files changed

+38
-20
lines changed

build.gradle.kts

+13-20
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
dependencies {
1111
constraints {
1212
// Dependency of 'com.github.breadmoirai.github-release:2.5.2'
13-
classpath("com.squareup.okio:okio:3.10.2") // CVE-2023-3635
13+
classpath(libs.okio) // CVE-2023-3635
1414
}
1515
}
1616
}
@@ -21,9 +21,9 @@ plugins {
2121
id("maven-publish")
2222
id("signing")
2323
id("codenarc")
24-
id("com.gradle.plugin-publish") version "1.3.0"
25-
id("com.github.breadmoirai.github-release") version "2.5.2"
26-
id("org.gradle.wrapper-upgrade") version "0.12"
24+
alias(libs.plugins.gradle.pluginPublish)
25+
alias(libs.plugins.github.release)
26+
alias(libs.plugins.gradle.wrapperUpgrade)
2727
}
2828

2929
val releaseVersion = releaseVersion()
@@ -40,25 +40,18 @@ repositories {
4040
}
4141

4242
dependencies {
43-
val versions = mapOf(
44-
"agp" to "8.1.4",
45-
"sdkBuildTools" to "31.1.1",
46-
"spock" to "2.3-groovy-3.0",
47-
)
48-
4943
compileOnly(gradleApi())
50-
compileOnly("com.android.tools.build:gradle:${versions["agp"]}")
51-
compileOnly("com.android.tools:common:${versions["sdkBuildTools"]}")
52-
compileOnly("com.android.tools:sdk-common:${versions["sdkBuildTools"]}")
53-
implementation("com.google.guava:guava:33.4.0-jre")
54-
44+
compileOnly(libs.android.gradlePlugin)
45+
compileOnly(libs.android.common)
46+
compileOnly(libs.android.sdkCommon)
47+
implementation(libs.guava)
5548

5649
testImplementation(gradleTestKit())
57-
testImplementation("com.android.tools.build:gradle:${versions["agp"]}")
58-
testImplementation(platform("org.spockframework:spock-bom:${versions["spock"]}"))
59-
testImplementation("org.spockframework:spock-core") { exclude(group = "org.codehaus.groovy") }
60-
testImplementation("org.spockframework:spock-junit4") { exclude(group = "org.codehaus.groovy") }
61-
testImplementation("org.junit.jupiter:junit-jupiter-api")
50+
testImplementation(libs.android.gradlePlugin)
51+
testImplementation(platform(libs.spock.bom))
52+
testImplementation(libs.spock.core) { exclude(group = "org.codehaus.groovy") }
53+
testImplementation(libs.spock.junit4) { exclude(group = "org.codehaus.groovy") }
54+
testImplementation(libs.junit.jupiter.api)
6255
}
6356

6457
wrapperUpgrade {

gradle/libs.versions.toml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[versions]
2+
android-gradlePlugin = "8.1.4"
3+
android-sdkBuildTools = "31.1.1"
4+
github-release = "2.5.2"
5+
gradle-pluginPublish = "1.3.0"
6+
gradle-wrapperUpgrade = "0.12"
7+
guava = "33.4.0-jre"
8+
okio = "3.10.2"
9+
spock = "2.3-groovy-3.0"
10+
11+
[libraries]
12+
android-common = { module = "com.android.tools:common", version.ref = "android-sdkBuildTools" }
13+
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "android-gradlePlugin" }
14+
android-sdkCommon = { module = "com.android.tools:sdk-common", version.ref = "android-sdkBuildTools" }
15+
guava = { module = "com.google.guava:guava", version.ref = "guava" }
16+
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
17+
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
18+
spock-bom = { module = "org.spockframework:spock-bom", version.ref = "spock" }
19+
spock-core = { module = "org.spockframework:spock-core" }
20+
spock-junit4 = { module = "org.spockframework:spock-junit4" }
21+
22+
[plugins]
23+
github-release = { id = "com.github.breadmoirai.github-release", version.ref = "github-release" }
24+
gradle-pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "gradle-pluginPublish" }
25+
gradle-wrapperUpgrade = { id = "org.gradle.wrapper-upgrade", version.ref = "gradle-wrapperUpgrade" }

0 commit comments

Comments
 (0)