Skip to content

Commit f5dfabb

Browse files
authored
Migrate maven_jar usage to rules_jvm_external (bazelbuild#127)
* Migrate maven_jar usage to rules_jvm_external * Fix merge conflicts * Fix formatting * Fix typo
1 parent 7f1b8f1 commit f5dfabb

File tree

1 file changed

+21
-11
lines changed

1 file changed

+21
-11
lines changed

android/firebase-cloud-messaging/WORKSPACE

+21-11
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ android_sdk_repository(
55
name = "androidsdk",
66
)
77

8-
RULES_JVM_EXTERNAL_TAG = "2.8"
9-
10-
RULES_JVM_EXTERNAL_SHA = "79c9850690d7614ecdb72d68394f994fef7534b292c4867ce5e7dec0aa7bdfad"
8+
RULES_JVM_EXTERNAL_TAG = "2.9"
9+
RULES_JVM_EXTERNAL_SHA = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45"
1110

1211
http_archive(
1312
name = "rules_jvm_external",
14-
sha256 = RULES_JVM_EXTERNAL_SHA,
1513
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
14+
sha256 = RULES_JVM_EXTERNAL_SHA,
1615
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
1716
)
1817

@@ -23,21 +22,32 @@ maven_install(
2322
"com.google.firebase:firebase-messaging:17.0.0",
2423
"com.android.support:appcompat-v7:26.1.0",
2524
"com.android.support.constraint:constraint-layout:1.0.2",
25+
"com.google.code.gson:gson:2.8.2",
2626
],
27-
fetch_sources = True,
2827
repositories = [
29-
"https://jcenter.bintray.com/",
28+
"https://jcenter.bintray.com",
3029
"https://maven.google.com",
30+
"https://repo1.maven.org/maven2",
3131
],
32+
fetch_sources = True,
33+
version_conflict_policy = "pinned",
34+
# See https://github.com/bazelbuild/rules_jvm_external/#repository-aliases
35+
# This can be removed if none of your external dependencies uses `maven_jar`.
36+
generate_compat_repositories = True,
3237
)
38+
load("@maven//:compat.bzl", "compat_repositories")
39+
compat_repositories()
3340

3441
TOOLS_ANDROID_COMMIT = "0e864ba5a86958513658250de587416d8e17c481"
3542

3643
http_archive(
3744
name = "tools_android",
38-
sha256 = "57c50d6331ba578fc8adfcede20ef12b437cb4cc2edf60c852e4b834eefee5fc",
3945
strip_prefix = "tools_android-" + TOOLS_ANDROID_COMMIT,
4046
url = "https://github.com/bazelbuild/tools_android/archive/%s.tar.gz" % TOOLS_ANDROID_COMMIT,
47+
sha256 = "57c50d6331ba578fc8adfcede20ef12b437cb4cc2edf60c852e4b834eefee5fc",
48+
repo_mapping = {
49+
"@com_google_code_gson_2_8_2": "@com_google_code_gson_gson",
50+
},
4151
)
4252

4353
load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies")
@@ -53,8 +63,8 @@ http_archive(
5363
)
5464

5565
http_archive(
56-
name = "rules_cc",
57-
url = "https://github.com/bazelbuild/rules_cc/archive/624b5d59dfb45672d4239422fa1e3de1822ee110.zip",
58-
sha256 = "8c7e8bf24a2bf515713445199a677ee2336e1c487fa1da41037c6026de04bbc3",
59-
strip_prefix = "rules_cc-624b5d59dfb45672d4239422fa1e3de1822ee110",
66+
name = "rules_cc",
67+
url = "https://github.com/bazelbuild/rules_cc/archive/624b5d59dfb45672d4239422fa1e3de1822ee110.zip",
68+
sha256 = "8c7e8bf24a2bf515713445199a677ee2336e1c487fa1da41037c6026de04bbc3",
69+
strip_prefix = "rules_cc-624b5d59dfb45672d4239422fa1e3de1822ee110",
6070
)

0 commit comments

Comments
 (0)