@@ -33,28 +33,29 @@ android_test_repositories()
3333
3434load ("@bazel_tools//tools/build_defs/repo:http.bzl" , "http_archive" )
3535
36-
3736RULES_JVM_EXTERNAL_TAG = "3.1"
37+
3838RULES_JVM_EXTERNAL_SHA = "e246373de2353f3d34d35814947aa8b7d0dd1a58c2f7a6c41cfeaff3007c2d14"
3939
4040http_archive (
4141 name = "rules_jvm_external" ,
42- strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG ,
4342 sha256 = RULES_JVM_EXTERNAL_SHA ,
43+ strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG ,
4444 url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG ,
4545)
4646
4747load ("@rules_jvm_external//:defs.bzl" , "maven_install" )
4848load ("@rules_jvm_external//:specs.bzl" , "maven" )
49- load ("//:common_defs.bzl" ,
50- "androidxLibVersion" ,
51- "coreVersion" ,
52- "espressoVersion" ,
53- "extJUnitVersion" ,
54- "extTruthVersion" ,
55- "rulesVersion" ,
56- "runnerVersion" ,
57- "uiAutomatorVersion" ,
49+ load (
50+ "//:common_defs.bzl" ,
51+ "androidxLibVersion" ,
52+ "coreVersion" ,
53+ "espressoVersion" ,
54+ "extJUnitVersion" ,
55+ "extTruthVersion" ,
56+ "rulesVersion" ,
57+ "runnerVersion" ,
58+ "uiAutomatorVersion" ,
5859)
5960
6061maven_install (
@@ -76,7 +77,12 @@ maven_install(
7677 "androidx.test:runner:" + runnerVersion ,
7778 "androidx.test.uiautomator:uiautomator:" + uiAutomatorVersion ,
7879 "androidx.viewpager:viewpager:1.0.0" ,
79- maven .artifact ("com.google.inject" , "guice" , "4.0" , neverlink = True ),
80+ maven .artifact (
81+ "com.google.inject" ,
82+ "guice" ,
83+ "4.0" ,
84+ neverlink = True ,
85+ ),
8086 "junit:junit:4.12" ,
8187 "javax.inject:javax.inject:1" ,
8288 "org.hamcrest:java-hamcrest:2.0.0.0" ,
@@ -91,11 +97,11 @@ maven_install(
9197 "com.google.truth:truth:0.42" ,
9298 "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0" ,
9399 ],
100+ jetify = True ,
94101 repositories = [
95102 "https://maven.google.com" ,
96103 "https://repo1.maven.org/maven2" ,
97104 ],
98- jetify = True ,
99105 version_conflict_policy = "pinned" ,
100106)
101107
@@ -112,6 +118,3 @@ http_archive(
112118load ("@bazel_toolchains//rules:rbe_repo.bzl" , "rbe_autoconfig" )
113119
114120rbe_autoconfig (name = "rbe_default" )
115-
116- # RBE support for android_device and android_instrumentation_test on RBE.
117- register_execution_platforms (":android_platform" )
0 commit comments