Skip to content

Commit

Permalink
Fetch android_databinding dependencies with rules_jvm_external (non-t…
Browse files Browse the repository at this point in the history
…hird_party)

This PR basically reverts #11629 and fetch android databinding jars and their dependencies with rules_jvm_external instead.

We still need to keep `third_party/java/android_databinding/v3_4_0/exec.jar` because it is custom prebuilt tool and there is no corresponding maven coordinate.

Working towards: #17036

Closes #17727.

PiperOrigin-RevId: 516246992
Change-Id: I122ab5e9037668ac6913ab03df186609bbc0f458
  • Loading branch information
meteorcloudy authored and copybara-github committed Mar 13, 2023
1 parent 0e6cc07 commit 51434e4
Show file tree
Hide file tree
Showing 3 changed files with 289 additions and 4 deletions.
4 changes: 4 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ load("@rules_jvm_external//:specs.bzl", "maven")

maven_install(
artifacts = [
"com.beust:jcommander:1.48",
"com.github.ben-manes.caffeine:caffeine:3.0.5",
"com.github.kevinstern:software-and-algorithms:1.0",
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
Expand Down Expand Up @@ -695,6 +696,7 @@ maven_install(
"io.reactivex.rxjava3:rxjava:3.1.2",
"javax.activation:javax.activation-api:1.2.0",
"javax.annotation:javax.annotation-api:1.3.2",
"javax.inject:javax.inject:1",
"net.bytebuddy:byte-buddy-agent:1.9.7",
"net.bytebuddy:byte-buddy:1.9.7",
"org.apache.commons:commons-compress:1.19",
Expand Down Expand Up @@ -737,6 +739,7 @@ pinned_maven_install()
maven_install(
name = "maven_android",
artifacts = [
"androidx.databinding:databinding-compiler:3.4.0-alpha10",
"com.android.tools.build:builder:7.1.3",
"com.android.tools.build:manifest-merger:30.1.3",
"com.android.tools:sdk-common:30.1.3",
Expand All @@ -745,6 +748,7 @@ maven_install(
"com.android.tools:common:30.1.3",
"com.android.tools:repository:30.1.3",
],
fail_if_repin_required = True,
maven_install_json = "//src/tools/android:maven_android_install.json",
repositories = [
"https://dl.google.com/android/maven2",
Expand Down
29 changes: 27 additions & 2 deletions maven_install.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,35 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": 1648963896,
"__RESOLVED_ARTIFACTS_HASH": -1527669231,
"__INPUT_ARTIFACTS_HASH": -603389432,
"__RESOLVED_ARTIFACTS_HASH": 87184791,
"conflict_resolution": {},
"dependencies": [
{
"coord": "com.beust:jcommander:1.48",
"dependencies": [],
"directDependencies": [],
"exclusions": [
"com.google.protobuf:protobuf-javalite",
"org.apache.httpcomponents:httpcore",
"com.google.protobuf:protobuf-java",
"org.eclipse.jgit:org.eclipse.jgit",
"org.apache.httpcomponents:httpclient"
],
"file": "v1/https/repo1.maven.org/maven2/com/beust/jcommander/1.48/jcommander-1.48.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/com/beust/jcommander/1.48/jcommander-1.48.jar"
],
"packages": [
"com.beust.jcommander",
"com.beust.jcommander.converters",
"com.beust.jcommander.defaultprovider",
"com.beust.jcommander.internal",
"com.beust.jcommander.validators"
],
"sha256": "a7313fcfde070930e40ec79edf3c5948cf34e4f0d25cb3a09f9963d8bdd84113",
"url": "https://repo1.maven.org/maven2/com/beust/jcommander/1.48/jcommander-1.48.jar"
},
{
"coord": "com.github.ben-manes.caffeine:caffeine:3.0.5",
"dependencies": [
Expand Down
Loading

0 comments on commit 51434e4

Please sign in to comment.