Skip to content

Commit 47bb909

Browse files
authored
Update our buildSrc maven api dependencies (#6445)
Old dependencies use the outdated artifacts, from the outdated groups, from a decade ago.
1 parent f20340a commit 47bb909

File tree

6 files changed

+31
-24
lines changed

6 files changed

+31
-24
lines changed

buildSrc/build.gradle.kts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,11 @@ 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.bundles.maven.resolver)
5556

56-
implementation("org.eclipse.aether:aether-api:1.0.0.v20140518")
57-
implementation("org.eclipse.aether:aether-util:1.0.0.v20140518")
57+
implementation("com.google.guava:guava:31.1-jre")
5858
implementation("org.ow2.asm:asm-tree:9.5")
59-
implementation("org.eclipse.aether:aether-impl:1.0.0.v20140518")
60-
implementation("org.eclipse.aether:aether-connector-basic:1.0.0.v20140518")
61-
implementation("org.eclipse.aether:aether-transport-file:1.0.0.v20140518")
62-
implementation("org.eclipse.aether:aether-transport-http:1.0.0.v20140518")
63-
implementation("org.eclipse.aether:aether-transport-wagon:1.0.0.v20140518")
64-
implementation("org.apache.maven:maven-aether-provider:3.3.9")
65-
6659
implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
67-
6860
implementation(libs.kotlinx.serialization.json)
6961
implementation("com.google.code.gson:gson:2.8.9")
7062
implementation(libs.android.gradlePlugin.gradle)

buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import static java.util.stream.Collectors.toList;
1818

19-
import com.google.common.collect.ImmutableList;
2019
import com.google.common.collect.ImmutableMap;
2120
import com.google.common.collect.Sets;
2221
import com.google.firebase.gradle.bomgenerator.model.Dependency;
@@ -51,7 +50,7 @@
5150

5251
public abstract class BomGeneratorTask extends DefaultTask {
5352
private static final List<String> BOM_ARTIFACTS =
54-
ImmutableList.of(
53+
List.of(
5554
"com.google.firebase:firebase-analytics",
5655
"com.google.firebase:firebase-analytics-ktx",
5756
"com.google.firebase:firebase-appcheck-debug",
@@ -94,7 +93,7 @@ public abstract class BomGeneratorTask extends DefaultTask {
9493
"com.google.firebase:firebase-storage-ktx",
9594
"com.google.firebase:firebase-vertexai");
9695
private static final List<String> IGNORED_ARTIFACTS =
97-
ImmutableList.of(
96+
List.of(
9897
"crash-plugin",
9998
"firebase-ml-vision",
10099
"crashlytics",
@@ -175,7 +174,7 @@ public abstract class BomGeneratorTask extends DefaultTask {
175174
"firebase-ml-natural-language-translate",
176175
"firebase-ml-natural-language-translate-model");
177176
private static final List<String> IMPORTANT_NON_FIREBASE_LIBRARIES =
178-
ImmutableList.of(
177+
List.of(
179178
"com.google.android.gms:play-services-ads",
180179
"com.google.gms:google-services",
181180
"com.android.tools.build:gradle",

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.firebase.gradle.plugins
1818

19-
import com.google.common.collect.ImmutableList
2019
import com.google.firebase.gradle.plugins.LibraryType.JAVA
2120
import com.google.firebase.gradle.plugins.semver.ApiDiffer
2221
import com.google.firebase.gradle.plugins.semver.GmavenCopier
@@ -56,7 +55,7 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
5655

5756
// reduce the likelihood of kotlin module files colliding.
5857
project.tasks.withType<KotlinCompile> {
59-
kotlinOptions.freeCompilerArgs = ImmutableList.of("-module-name", kotlinModuleName(project))
58+
kotlinOptions.freeCompilerArgs = listOf("-module-name", kotlinModuleName(project))
6059
}
6160
}
6261

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.firebase.gradle.plugins.ci;
1616

17-
import com.google.common.collect.ImmutableList;
1817
import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
1918
import java.util.List;
2019
import java.util.Set;
@@ -124,7 +123,7 @@ private static void setupChangedTask(
124123
}
125124

126125
private static final List<String> ANDROID_PLUGINS =
127-
ImmutableList.of("com.android.application", "com.android.library", "com.android.test");
126+
List.of("com.android.application", "com.android.library", "com.android.test");
128127

129128
private static boolean isAndroidProject(Project project) {
130129
return ANDROID_PLUGINS.stream()

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/Coverage.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
package com.google.firebase.gradle.plugins.ci;
1616

1717
import com.google.common.collect.ImmutableList;
18-
import com.google.common.collect.ImmutableMap;
1918
import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
2019
import java.io.File;
2120
import java.util.List;
21+
import java.util.Map;
2222
import org.gradle.api.Project;
2323
import org.gradle.api.tasks.testing.Test;
2424
import org.gradle.testing.jacoco.plugins.JacocoPluginExtension;
@@ -32,7 +32,7 @@ private Coverage() {}
3232

3333
public static void apply(FirebaseLibraryExtension firebaseLibrary) {
3434
Project project = firebaseLibrary.getProject();
35-
project.apply(ImmutableMap.of("plugin", "jacoco"));
35+
project.apply(Map.of("plugin", "jacoco"));
3636
File reportsDir = new File(project.getBuildDir(), "/reports/jacoco");
3737
JacocoPluginExtension jacoco = project.getExtensions().getByType(JacocoPluginExtension.class);
3838

@@ -45,7 +45,7 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
4545
test -> {
4646
JacocoTaskExtension testJacoco =
4747
test.getExtensions().getByType(JacocoTaskExtension.class);
48-
testJacoco.setExcludeClassLoaders(ImmutableList.of("jdk.internal.*"));
48+
testJacoco.setExcludeClassLoaders(List.of("jdk.internal.*"));
4949
testJacoco.setIncludeNoLocationClasses(true);
5050
});
5151

@@ -72,13 +72,13 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
7272
.setFrom(
7373
project.files(
7474
project.fileTree(
75-
ImmutableMap.of(
75+
Map.of(
7676
"dir",
7777
project.getBuildDir() + "/intermediates/javac/release",
7878
"excludes",
7979
excludes)),
8080
project.fileTree(
81-
ImmutableMap.of(
81+
Map.of(
8282
"dir",
8383
project.getBuildDir() + "/tmp/kotlin-classes/release",
8484
"excludes",
@@ -88,7 +88,7 @@ public static void apply(FirebaseLibraryExtension firebaseLibrary) {
8888
task.getExecutionData()
8989
.setFrom(
9090
project.fileTree(
91-
ImmutableMap.of(
91+
Map.of(
9292
"dir",
9393
project.getBuildDir(),
9494
"includes",

gradle/libs.versions.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ grpc = "1.62.2"
1111
grpcKotlin = "1.4.1"
1212
javalite = "3.25.5"
1313
kotlin = "1.8.22"
14+
mavenResolverApi = "1.9.22"
15+
mavenResolverProvider = "3.9.9"
1416
mockk = "1.13.11"
1517
serialization-plugin = "1.8.22"
1618
protoc = "3.25.5"
@@ -61,6 +63,13 @@ kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version
6163
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
6264
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
6365
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
66+
maven-resolver-api = { module = "org.apache.maven.resolver:maven-resolver-api", version.ref = "mavenResolverApi" }
67+
maven-resolver-connector-basic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "mavenResolverApi" }
68+
maven-resolver-impl = { module = "org.apache.maven.resolver:maven-resolver-impl", version.ref = "mavenResolverApi" }
69+
maven-resolver-provider = { module = "org.apache.maven:maven-resolver-provider", version.ref = "mavenResolverProvider" }
70+
maven-resolver-transport-file = { module = "org.apache.maven.resolver:maven-resolver-transport-file", version.ref = "mavenResolverApi" }
71+
maven-resolver-transport-http = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "mavenResolverApi" }
72+
maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util", version.ref = "mavenResolverApi" }
6473
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "3.12.13" }
6574
org-json = { module = "org.json:json", version = "20210307" }
6675
playservices-base = { module = "com.google.android.gms:play-services-base", version = "18.1.0" }
@@ -104,6 +113,15 @@ testonly-three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", v
104113
[bundles]
105114
kotest = ["kotest-runner", "kotest-assertions", "kotest-property", "kotest-property-arbs"]
106115
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+
]
107125

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

0 commit comments

Comments
 (0)