Skip to content

Commit 86bb9db

Browse files
jinjin
authored
Migrate gmaven_rules and jvm_import_external to use the new rules_jvm_external resolver (#249)
1 parent 07e88d4 commit 86bb9db

File tree

11 files changed

+110
-106
lines changed

11 files changed

+110
-106
lines changed

‎BUILD.bazel

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
22
load("//:common_defs.bzl", "androidxLibVersion", "coreVersion", "espressoVersion", "extJUnitVersion", "extTruthVersion", "rulesVersion", "runnerVersion")
33

44
licenses(["notice"]) # Apache 2.0
@@ -7,17 +7,17 @@ android_library(
77
name = "test_deps",
88
visibility = ["//visibility:public"],
99
exports = [
10-
gmaven_artifact("androidx.annotation:annotation:jar:" + androidxLibVersion),
11-
gmaven_artifact("androidx.test.espresso:espresso-core:aar:" + espressoVersion),
12-
gmaven_artifact("androidx.test:rules:aar:" + rulesVersion),
13-
gmaven_artifact("androidx.test:runner:aar:" + runnerVersion),
14-
gmaven_artifact("androidx.test:monitor:aar:" + runnerVersion),
15-
gmaven_artifact("androidx.test.ext:junit:aar:" + extJUnitVersion),
16-
gmaven_artifact("androidx.test:core:aar:" + coreVersion),
17-
"@com_google_guava_guava//jar",
18-
"@com_google_inject_guice//jar",
19-
"@javax_inject_javax_inject//jar",
20-
"@junit_junit//jar",
21-
"@org_hamcrest_java_hamcrest//jar",
10+
artifact("androidx.annotation:annotation"),
11+
artifact("androidx.test.espresso:espresso-core"),
12+
artifact("androidx.test:rules"),
13+
artifact("androidx.test:runner"),
14+
artifact("androidx.test:monitor"),
15+
artifact("androidx.test.ext:junit"),
16+
artifact("androidx.test:core"),
17+
artifact("com.google.guava:guava"),
18+
artifact("com.google.inject:guice"),
19+
artifact("javax.inject:javax.inject"),
20+
artifact("junit:junit"),
21+
artifact("org.hamcrest:java-hamcrest"),
2222
],
2323
)

‎WORKSPACE

+53-52
Original file line numberDiff line numberDiff line change
@@ -29,64 +29,65 @@ load("@android_test_support//:repo.bzl", "android_test_repositories")
2929

3030
android_test_repositories()
3131

32-
# Google Maven Repository
33-
# This repository contains the external dependency definitions for Google Maven artifacts.
34-
GMAVEN_TAG = "20181206-1"
35-
36-
http_archive(
37-
name = "gmaven_rules",
38-
strip_prefix = "gmaven_rules-%s" % GMAVEN_TAG,
39-
url = "https://github.com/bazelbuild/gmaven_rules/archive/%s.tar.gz" % GMAVEN_TAG,
40-
)
41-
42-
load("@gmaven_rules//:gmaven.bzl", "gmaven_rules")
43-
44-
gmaven_rules()
45-
46-
jvm_maven_import_external(
47-
name = "com_google_inject_guice",
48-
server_urls = ["http://central.maven.org/maven2"],
49-
licenses = ["notice"], # Apache 2.0
50-
artifact = "com.google.inject:guice:4.0",
51-
artifact_sha256 = "b378ffc35e7f7125b3c5f3a461d4591ae1685e3c781392f0c854ed7b7581d6d2",
52-
)
32+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
5333

54-
jvm_maven_import_external(
55-
name = "junit_junit",
56-
server_urls = ["http://central.maven.org/maven2"],
57-
licenses = ["notice"], # Apache 2.0
58-
artifact = "junit:junit:4.12",
59-
artifact_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
60-
)
34+
RULES_JVM_EXTERNAL_TAG = "1.0"
35+
RULES_JVM_EXTERNAL_SHA = "48e0f1aab74fabba98feb8825459ef08dcc75618d381dff63ec9d4dd9860deaa"
6136

62-
jvm_maven_import_external(
63-
name = "javax_inject_javax_inject",
64-
server_urls = ["http://central.maven.org/maven2"],
65-
licenses = ["notice"], # Apache 2.0
66-
artifact = "javax.inject:javax.inject:1",
67-
artifact_sha256 = "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff",
37+
http_archive(
38+
name = "rules_jvm_external",
39+
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
40+
sha256 = RULES_JVM_EXTERNAL_SHA,
41+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
6842
)
6943

70-
jvm_maven_import_external(
71-
name = "org_hamcrest_java_hamcrest",
72-
server_urls = ["http://central.maven.org/maven2"],
73-
licenses = ["notice"], # Apache 2.0
74-
artifact = "org.hamcrest:java-hamcrest:2.0.0.0",
75-
artifact_sha256 = "09bc7044d57a497846e2480250e7a72ff3ae58efefc8c3a9ceecd0f4e092851c",
44+
# Keeping a copy of gmaven_rules around so dependencies can use it
45+
# TODO(jin): remove this when android/android-test no longer depends on gmaven_rules.
46+
http_archive(
47+
name = "gmaven_rules",
48+
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
49+
sha256 = RULES_JVM_EXTERNAL_SHA,
50+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
7651
)
7752

78-
jvm_maven_import_external(
79-
name = "com_google_guava_guava",
80-
server_urls = ["http://central.maven.org/maven2"],
81-
licenses = ["notice"], # Apache 2.0
82-
artifact = "com.google.guava:guava:26.0-android",
83-
artifact_sha256 = "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5",
53+
load("@rules_jvm_external//:defs.bzl", "maven_install")
54+
load("//:common_defs.bzl",
55+
"androidxLibVersion",
56+
"coreVersion",
57+
"espressoVersion",
58+
"extJUnitVersion",
59+
"extTruthVersion",
60+
"rulesVersion",
61+
"runnerVersion",
62+
"uiAutomatorVersion",
8463
)
8564

86-
jvm_maven_import_external(
87-
name = "truth",
88-
server_urls = ["http://central.maven.org/maven2"],
89-
licenses = ["notice"], # Apache 2.0
90-
artifact = "com.google.truth:truth:0.42",
91-
artifact_sha256 = "dd652bdf0c4427c59848ac0340fd6b6d20c2cbfaa3c569a8366604dbcda5214c",
65+
maven_install(
66+
name = "maven",
67+
artifacts = [
68+
"androidx.annotation:annotation:" + androidxLibVersion,
69+
"androidx.core:core:" + androidxLibVersion,
70+
"androidx.recyclerview:recyclerview:" + androidxLibVersion,
71+
"androidx.test:core:" + coreVersion,
72+
"androidx.test.espresso:espresso-contrib:" + espressoVersion,
73+
"androidx.test.espresso:espresso-core:" + espressoVersion,
74+
"androidx.test.espresso:espresso-idling-resource:" + espressoVersion,
75+
"androidx.test.espresso:espresso-intents:" + espressoVersion,
76+
"androidx.test.ext:junit:" + extJUnitVersion,
77+
"androidx.test.ext:truth:" + extTruthVersion,
78+
"androidx.test:monitor:" + runnerVersion,
79+
"androidx.test:rules:" + rulesVersion,
80+
"androidx.test:runner:" + runnerVersion,
81+
"androidx.test.uiautomator:uiautomator:" + uiAutomatorVersion,
82+
"com.google.inject:guice:4.0",
83+
"junit:junit:4.12",
84+
"javax.inject:javax.inject:1",
85+
"org.hamcrest:java-hamcrest:2.0.0.0",
86+
"com.google.guava:guava:26.0-android",
87+
"com.google.truth:truth:0.42",
88+
],
89+
repositories = [
90+
"https://maven.google.com",
91+
"https://repo1.maven.org/maven2",
92+
],
9293
)

‎ui/espresso/BasicSample/BUILD.bazel

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
licenses(["notice"]) # Apache 2.0
22

33
load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
4+
load("@rules_jvm_external//:defs.bzl", "artifact")
45

56
android_library(
67
name = "BasicSampleLib",
78
srcs = glob(["app/src/main/**/*.java"]),
89
custom_package = "com.example.android.testing.espresso.BasicSample",
910
manifest = "app/src/main/AndroidManifest.xml",
1011
resource_files = glob(["app/src/main/res/**/*"]),
11-
deps = ["@com_google_guava_guava//jar"],
12+
deps = [
13+
artifact("com.google.guava:guava")
14+
],
1215
)
1316

1417
android_binary(

‎ui/espresso/CustomMatcherSample/BUILD.bazel

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
2-
load("//:common_defs.bzl", "androidxLibVersion", "minSdkVersion", "targetSdkVersion")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
2+
load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
33

44
licenses(["notice"]) # Apache 2.0
55

@@ -10,8 +10,8 @@ android_library(
1010
manifest = "app/src/main/AndroidManifest.xml",
1111
resource_files = glob(["app/src/main/res/**/*"]),
1212
deps = [
13-
gmaven_artifact("androidx.annotation:annotation:" + androidxLibVersion),
14-
"@com_google_guava_guava//jar",
13+
artifact("androidx.annotation:annotation"),
14+
artifact("com.google.guava:guava"),
1515
],
1616
)
1717

‎ui/espresso/DataAdapterSample/BUILD.bazel

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
2-
load("//:common_defs.bzl", "androidxLibVersion", "minSdkVersion", "targetSdkVersion")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
2+
load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
33

44
licenses(["notice"]) # Apache 2.0
55

@@ -10,8 +10,8 @@ android_library(
1010
manifest = "app/src/main/AndroidManifest.xml",
1111
resource_files = glob(["app/src/main/res/**/*"]),
1212
deps = [
13-
gmaven_artifact("androidx.annotation:annotation:" + androidxLibVersion),
14-
"@com_google_guava_guava//jar",
13+
artifact("androidx.annotation:annotation"),
14+
artifact("com.google.guava:guava"),
1515
],
1616
)
1717

‎ui/espresso/IdlingResourceSample/BUILD.bazel

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
2-
load("//:common_defs.bzl", "androidxLibVersion", "espressoVersion", "minSdkVersion", "targetSdkVersion")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
2+
load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
33

44
licenses(["notice"]) # Apache 2.0
55

@@ -10,9 +10,9 @@ android_library(
1010
manifest = "app/src/main/AndroidManifest.xml",
1111
resource_files = glob(["app/src/main/res/**/*"]),
1212
deps = [
13-
gmaven_artifact("androidx.annotation:annotation:" + androidxLibVersion),
14-
gmaven_artifact("androidx.test.espresso:espresso-idling-resource:aar:" + espressoVersion),
15-
"@com_google_guava_guava//jar",
13+
artifact("androidx.annotation:annotation"),
14+
artifact("androidx.test.espresso:espresso-idling-resource"),
15+
artifact("com.google.guava:guava"),
1616
],
1717
)
1818

@@ -32,7 +32,7 @@ android_library(
3232
srcs = glob(["app/src/androidTest/**/*.java"]),
3333
custom_package = "com.example.android.testing.espresso.IdlingResourceSample.test",
3434
deps = [
35-
gmaven_artifact("androidx.test.espresso:espresso_idling_resource:aar:" + espressoVersion),
35+
artifact("androidx.test.espresso:espresso_idling_resource"),
3636
":IdlingResourceSampleLib",
3737
"//:test_deps",
3838
],

‎ui/espresso/IntentsAdvancedSample/BUILD.bazel

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
2-
load("//:common_defs.bzl", "androidxLibVersion", "espressoVersion", "minSdkVersion", "targetSdkVersion")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
2+
load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
33

44
licenses(["notice"]) # Apache 2.0
55

@@ -10,8 +10,8 @@ android_library(
1010
manifest = "app/src/main/AndroidManifest.xml",
1111
resource_files = glob(["app/src/main/res/**/*"]),
1212
deps = [
13-
gmaven_artifact("androidx.annotation:annotation:" + androidxLibVersion),
14-
"@com_google_guava_guava//jar",
13+
artifact("androidx.annotation:annotation"),
14+
artifact("com.google.guava:guava"),
1515
],
1616
)
1717

@@ -31,7 +31,7 @@ android_library(
3131
srcs = glob(["app/src/androidTest/**/*.java"]),
3232
custom_package = "com.example.android.testing.espresso.intents.AdvancedSample.test",
3333
deps = [
34-
gmaven_artifact("androidx.test.espresso:espresso-intents:aar:" + espressoVersion),
34+
artifact("androidx.test.espresso:espresso-intents"),
3535
":IntentsAdvancedSampleLib",
3636
"//:test_deps",
3737
],

‎ui/espresso/IntentsBasicSample/BUILD.bazel

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
2-
load("//:common_defs.bzl", "androidxLibVersion", "coreVersion", "espressoVersion", "extTruthVersion", "minSdkVersion", "targetSdkVersion")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
2+
load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
33

44
licenses(["notice"]) # Apache 2.0
55

@@ -10,9 +10,9 @@ android_library(
1010
manifest = "app/src/main/AndroidManifest.xml",
1111
resource_files = glob(["app/src/main/res/**/*"]),
1212
deps = [
13-
gmaven_artifact("androidx.annotation:annotation:" + androidxLibVersion),
14-
gmaven_artifact("androidx.core:core:aar:" + androidxLibVersion),
15-
"@com_google_guava_guava//jar",
13+
artifact("androidx.annotation:annotation"),
14+
artifact("androidx.core:core"),
15+
artifact("com.google.guava:guava"),
1616
],
1717
)
1818

@@ -34,9 +34,9 @@ android_library(
3434
deps = [
3535
":IntentsBasicSampleLib",
3636
"//:test_deps",
37-
gmaven_artifact("androidx.test.espresso:espresso-intents:aar:" + espressoVersion),
38-
gmaven_artifact("androidx.test.ext:truth:aar:" + extTruthVersion),
39-
"@truth//jar",
37+
artifact("androidx.test.espresso:espresso-intents"),
38+
artifact("androidx.test.ext:truth"),
39+
artifact("com.google.truth:truth"),
4040
],
4141
)
4242

‎ui/espresso/MultiWindowSample/BUILD.bazel

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
2-
load("//:common_defs.bzl", "androidxLibVersion", "minSdkVersion", "targetSdkVersion")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
2+
load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
33

44
licenses(["notice"]) # Apache 2.0
55

@@ -10,8 +10,8 @@ android_library(
1010
manifest = "app/src/main/AndroidManifest.xml",
1111
resource_files = glob(["app/src/main/res/**/*"]),
1212
deps = [
13-
gmaven_artifact("androidx.annotation:annotation:jar:" + androidxLibVersion),
14-
"@com_google_guava_guava//jar",
13+
artifact("androidx.annotation:annotation"),
14+
artifact("com.google.guava:guava"),
1515
],
1616
)
1717

‎ui/espresso/RecyclerViewSample/BUILD.bazel

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
2-
load("//:common_defs.bzl", "androidxLibVersion", "espressoVersion", "minSdkVersion", "targetSdkVersion")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
2+
load("//:common_defs.bzl", "minSdkVersion", "targetSdkVersion")
33

44
licenses(["notice"]) # Apache 2.0
55

@@ -10,9 +10,9 @@ android_library(
1010
manifest = "app/src/main/AndroidManifest.xml",
1111
resource_files = glob(["app/src/main/res/**/*"]),
1212
deps = [
13-
gmaven_artifact("androidx.recyclerview:recyclerview:aar:" + androidxLibVersion),
14-
gmaven_artifact("androidx.annotation:annotation:" + androidxLibVersion),
15-
"@com_google_guava_guava//jar",
13+
artifact("androidx.recyclerview:recyclerview"),
14+
artifact("androidx.annotation:annotation"),
15+
artifact("com.google.guava:guava"),
1616
],
1717
)
1818

@@ -28,7 +28,7 @@ android_library(
2828
srcs = glob(["app/src/androidTest/**/*.java"]),
2929
custom_package = "com.example.android.testing.espresso.RecyclerViewSample.test",
3030
deps = [
31-
gmaven_artifact("androidx.test.espresso:espresso-contrib:aar:" + espressoVersion),
31+
artifact("androidx.test.espresso:espresso-contrib"),
3232
":RecyclerViewSampleLib",
3333
"//:test_deps",
3434
],

‎ui/uiautomator/BasicSample/BUILD.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@gmaven_rules//:defs.bzl", "gmaven_artifact")
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
22
load("//:common_defs.bzl", "uiAutomatorVersion")
33

44
licenses(["notice"]) # Apache 2.0
@@ -9,7 +9,7 @@ android_library(
99
custom_package = "com.example.android.testing.uiautomator.BasicSample",
1010
manifest = "app/src/main/AndroidManifest.xml",
1111
resource_files = glob(["app/src/main/res/**/*"]),
12-
deps = ["@com_google_guava_guava//jar"],
12+
deps = [artifact("com.google.guava:guava")],
1313
)
1414

1515
android_binary(
@@ -26,7 +26,7 @@ android_library(
2626
deps = [
2727
":BasicSampleLib",
2828
"//:test_deps",
29-
gmaven_artifact("androidx.test.uiautomator:uiautomator:aar:" + uiAutomatorVersion),
29+
artifact("androidx.test.uiautomator:uiautomator"),
3030
],
3131
)
3232

0 commit comments

Comments
 (0)