Skip to content

Commit 2a13767

Browse files
committed
Use bundles
1 parent 8b5cb2a commit 2a13767

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

buildSrc/build.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,7 @@ dependencies {
5252
annotationProcessor("com.google.auto.value:auto-value:1.6.5")
5353
implementation(kotlin("gradle-plugin", "1.8.22"))
5454
implementation(libs.org.json)
55-
implementation(libs.maven.resolver.api)
56-
implementation(libs.maven.resolver.connector.basic)
57-
implementation(libs.maven.resolver.transport.file)
58-
implementation(libs.maven.resolver.transport.http)
59-
implementation(libs.maven.resolver.impl)
60-
implementation(libs.maven.resolver.util)
61-
62-
implementation(libs.maven.resolver.provider)
55+
implementation(libs.bundles.maven.resolver)
6356

6457
implementation("com.google.guava:guava:31.1-jre")
6558
implementation("org.ow2.asm:asm-tree:9.5")

gradle/libs.versions.toml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ javalite = "3.25.5"
1313
kotlin = "1.8.22"
1414
mavenResolverApi = "1.9.22"
1515
mavenResolverProvider = "3.9.9"
16-
mavenResolverTransportHttp = "1.9.22"
1716
mockk = "1.13.11"
1817
serialization-plugin = "1.8.22"
1918
protoc = "3.25.5"
@@ -69,7 +68,7 @@ maven-resolver-connector-basic = { module = "org.apache.maven.resolver:maven-res
6968
maven-resolver-impl = { module = "org.apache.maven.resolver:maven-resolver-impl", version.ref = "mavenResolverApi" }
7069
maven-resolver-provider = { module = "org.apache.maven:maven-resolver-provider", version.ref = "mavenResolverProvider" }
7170
maven-resolver-transport-file = { module = "org.apache.maven.resolver:maven-resolver-transport-file", version.ref = "mavenResolverApi" }
72-
maven-resolver-transport-http = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "mavenResolverTransportHttp" }
71+
maven-resolver-transport-http = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "mavenResolverApi" }
7372
maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util", version.ref = "mavenResolverApi" }
7473
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "3.12.13" }
7574
org-json = { module = "org.json:json", version = "20210307" }
@@ -114,6 +113,15 @@ testonly-three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", v
114113
[bundles]
115114
kotest = ["kotest-runner", "kotest-assertions", "kotest-property", "kotest-property-arbs"]
116115
playservices = ["playservices-base", "playservices-basement", "playservices-tasks"]
116+
maven-resolver = [
117+
"maven-resolver-api",
118+
"maven-resolver-connector-basic",
119+
"maven-resolver-impl",
120+
"maven-resolver-provider",
121+
"maven-resolver-transport-file",
122+
"maven-resolver-transport-http",
123+
"maven-resolver-util"
124+
]
117125

118126
[plugins]
119127
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

0 commit comments

Comments
 (0)