Skip to content

Minor configuration cleanups#500

Open
Goooler wants to merge 7 commits intoJakeWharton:trunkfrom
Goooler:tweaks
Open

Minor configuration cleanups#500
Goooler wants to merge 7 commits intoJakeWharton:trunkfrom
Goooler:tweaks

Conversation

@Goooler
Copy link
Copy Markdown
Contributor

@Goooler Goooler commented Mar 28, 2026

No description provided.

Goooler added 6 commits March 28, 2026 11:45
```diff
 \--- project :formats
      +--- com.android.tools.apkparser:binary-resources:32.1.0
-     |    \--- com.google.guava:guava:33.3.1-jre -> 30.1-jre
-     |         +--- com.google.guava:failureaccess:1.0.1
-     |         +--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-     |         +--- com.google.code.findbugs:jsr305:3.0.2
-     |         +--- org.checkerframework:checker-qual:3.5.0
-     |         +--- com.google.errorprone:error_prone_annotations:2.3.4 -> 2.11.0
-     |         \--- com.google.j2objc:j2objc-annotations:1.3
+     |    \--- com.google.guava:guava:33.3.1-jre
+     |         +--- com.google.guava:failureaccess:1.0.2
+     |         +--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+     |         +--- com.google.code.findbugs:jsr305:3.0.2
+     |         +--- org.checkerframework:checker-qual:3.43.0
+     |         +--- com.google.errorprone:error_prone_annotations:2.28.0
+     |         \--- com.google.j2objc:j2objc-annotations:3.0.0
      \--- com.android.tools.build:bundletool:1.18.3
-          +--- com.google.errorprone:error_prone_annotations:2.3.1 -> 2.11.0
+          +--- com.google.errorprone:error_prone_annotations:2.3.1 -> 2.28.0
-          +--- com.google.guava:guava:32.0.1-jre -> 30.1-jre (*)
+          +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
           \--- com.google.protobuf:protobuf-java-util:3.22.3
-               +--- com.google.errorprone:error_prone_annotations:2.11.0
+               +--- com.google.errorprone:error_prone_annotations:2.11.0 -> 2.28.0
-               +--- com.google.guava:guava:31.1-jre -> 30.1-jre (*)
+               +--- com.google.guava:guava:31.1-jre -> 33.3.1-jre (*)
-               \--- com.google.j2objc:j2objc-annotations:1.3
+               \--- com.google.j2objc:j2objc-annotations:1.3 -> 3.0.0
```
Comment on lines -52 to -67
configurations.configureEach {
resolutionStrategy.eachDependency {
if (requested.group == "com.android.tools.build" && requested.name == "aapt2-proto") {
useVersion(libs.versions.aapt2Proto.get())
because("We need to keep depenedencies in sync with bundletool")
}
if (requested.group == "com.google.protobuf" && requested.name == "protobuf-java") {
useVersion(libs.versions.protobufJava.get())
because("We need to keep depenedencies in sync with bundletool")
}
if (requested.group == "com.google.guava" && requested.name == "guava") {
useVersion(libs.versions.guava.get())
because("We need to keep depenedencies in sync with bundletool")
}
}
}
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not very sure about this, but seems no hard to do so.

\--- project :formats
      +--- com.android.tools.apkparser:binary-resources:32.1.0
-     |    \--- com.google.guava:guava:33.3.1-jre -> 30.1-jre
-     |         +--- com.google.guava:failureaccess:1.0.1
-     |         +--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-     |         +--- com.google.code.findbugs:jsr305:3.0.2
-     |         +--- org.checkerframework:checker-qual:3.5.0
-     |         +--- com.google.errorprone:error_prone_annotations:2.3.4 -> 2.11.0
-     |         \--- com.google.j2objc:j2objc-annotations:1.3
+     |    \--- com.google.guava:guava:33.3.1-jre
+     |         +--- com.google.guava:failureaccess:1.0.2
+     |         +--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+     |         +--- com.google.code.findbugs:jsr305:3.0.2
+     |         +--- org.checkerframework:checker-qual:3.43.0
+     |         +--- com.google.errorprone:error_prone_annotations:2.28.0
+     |         \--- com.google.j2objc:j2objc-annotations:3.0.0
      \--- com.android.tools.build:bundletool:1.18.3
-          +--- com.google.errorprone:error_prone_annotations:2.3.1 -> 2.11.0
+          +--- com.google.errorprone:error_prone_annotations:2.3.1 -> 2.28.0
-          +--- com.google.guava:guava:32.0.1-jre -> 30.1-jre (*)
+          +--- com.google.guava:guava:32.0.1-jre -> 33.3.1-jre (*)
           \--- com.google.protobuf:protobuf-java-util:3.22.3
-               +--- com.google.errorprone:error_prone_annotations:2.11.0
+               +--- com.google.errorprone:error_prone_annotations:2.11.0 -> 2.28.0
-               +--- com.google.guava:guava:31.1-jre -> 30.1-jre (*)
+               +--- com.google.guava:guava:31.1-jre -> 33.3.1-jre (*)
-               \--- com.google.j2objc:j2objc-annotations:1.3
+               \--- com.google.j2objc:j2objc-annotations:1.3 -> 3.0.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant