Skip to content

Commit 2a0eebd

Browse files
author
Jaden Peterson
committed
Added rules_jvm_external
1 parent a3ed066 commit 2a0eebd

File tree

4 files changed

+91
-19
lines changed

4 files changed

+91
-19
lines changed

‎MODULE.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ single_version_override(
4545
version = "8.16.1",
4646
)
4747

48+
bazel_dep(name = "rules_jvm_external", version = "6.8")
4849
bazel_dep(name = "rules_proto", version = "6.0.0")
4950
single_version_override(
5051
module_name = "rules_proto",

‎WORKSPACE‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,20 @@ load(
150150
rules_shell_dependencies()
151151

152152
rules_shell_toolchains()
153+
154+
rules_jvm_external_version = "6.8"
155+
156+
http_archive(
157+
name = "rules_jvm_external",
158+
strip_prefix = "rules_jvm_external-%s" % rules_jvm_external_version,
159+
sha256 = "704a0197e4e966f96993260418f2542568198490456c21814f647ae7091f56f2",
160+
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % rules_jvm_external_version,
161+
)
162+
163+
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
164+
165+
rules_jvm_external_deps()
166+
167+
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
168+
169+
rules_jvm_external_setup()

‎examples/twitter_scrooge/MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ single_version_override(
2424
version = "33.0",
2525
)
2626

27-
bazel_dep(name = "rules_jvm_external", version = "6.7")
27+
bazel_dep(name = "rules_jvm_external", version = "6.8")
2828

2929
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
3030
maven.install(

‎examples/twitter_scrooge/maven_install.json‎

Lines changed: 72 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 1947796996,
4-
"__RESOLVED_ARTIFACTS_HASH": -1477454183,
3+
"__INPUT_ARTIFACTS_HASH": 1443541980,
4+
"__RESOLVED_ARTIFACTS_HASH": -952461148,
5+
"conflict_resolution": {
6+
"com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.18.0"
7+
},
58
"artifacts": {
69
"com.github.ben-manes.caffeine:caffeine": {
710
"shasums": {
@@ -23,21 +26,45 @@
2326
},
2427
"com.google.code.findbugs:jsr305": {
2528
"shasums": {
26-
"jar": "1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468"
29+
"jar": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7"
30+
},
31+
"version": "3.0.2"
32+
},
33+
"com.google.code.gson:gson": {
34+
"shasums": {
35+
"jar": "d3999291855de495c94c743761b8ab5176cfeabe281a5ab0d8e8d45326fd703e"
2736
},
28-
"version": "2.0.1"
37+
"version": "2.8.9"
2938
},
3039
"com.google.errorprone:error_prone_annotations": {
3140
"shasums": {
32-
"jar": "5f2a0648230a662e8be049df308d583d7369f13af683e44ddf5829b6d741a228"
41+
"jar": "9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae"
3342
},
34-
"version": "2.4.0"
43+
"version": "2.18.0"
44+
},
45+
"com.google.guava:failureaccess": {
46+
"shasums": {
47+
"jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26"
48+
},
49+
"version": "1.0.1"
3550
},
3651
"com.google.guava:guava": {
3752
"shasums": {
38-
"jar": "a896857d07845d38c7dc5bbc0457b6d9b0f62ecffda010e5e9ec12d561f676d3"
53+
"jar": "bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5"
3954
},
40-
"version": "16.0.1"
55+
"version": "32.0.1-jre"
56+
},
57+
"com.google.guava:listenablefuture": {
58+
"shasums": {
59+
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
60+
},
61+
"version": "9999.0-empty-to-avoid-conflict-with-guava"
62+
},
63+
"com.google.j2objc:j2objc-annotations": {
64+
"shasums": {
65+
"jar": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed"
66+
},
67+
"version": "2.8"
4168
},
4269
"com.twitter:scrooge-core_2.12": {
4370
"shasums": {
@@ -143,9 +170,9 @@
143170
},
144171
"org.checkerframework:checker-qual": {
145172
"shasums": {
146-
"jar": "bce5c887460542d69c0ffce05919fef8f56f9964a1505a99f6ae69a58351507e"
173+
"jar": "e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1"
147174
},
148-
"version": "3.4.1"
175+
"version": "3.33.0"
149176
},
150177
"org.codehaus.plexus:plexus-utils": {
151178
"shasums": {
@@ -195,6 +222,14 @@
195222
"com.github.spullara.mustache.java:compiler": [
196223
"com.google.guava:guava"
197224
],
225+
"com.google.guava:guava": [
226+
"com.google.code.findbugs:jsr305",
227+
"com.google.errorprone:error_prone_annotations",
228+
"com.google.guava:failureaccess",
229+
"com.google.guava:listenablefuture",
230+
"com.google.j2objc:j2objc-annotations",
231+
"org.checkerframework:checker-qual"
232+
],
198233
"com.twitter:scrooge-core_2.12": [
199234
"com.twitter:util-core_2.12",
200235
"javax.annotation:javax.annotation-api",
@@ -303,10 +338,24 @@
303338
"javax.annotation.concurrent",
304339
"javax.annotation.meta"
305340
],
341+
"com.google.code.gson:gson": [
342+
"com.google.gson",
343+
"com.google.gson.annotations",
344+
"com.google.gson.internal",
345+
"com.google.gson.internal.bind",
346+
"com.google.gson.internal.bind.util",
347+
"com.google.gson.internal.reflect",
348+
"com.google.gson.internal.sql",
349+
"com.google.gson.reflect",
350+
"com.google.gson.stream"
351+
],
306352
"com.google.errorprone:error_prone_annotations": [
307353
"com.google.errorprone.annotations",
308354
"com.google.errorprone.annotations.concurrent"
309355
],
356+
"com.google.guava:failureaccess": [
357+
"com.google.common.util.concurrent.internal"
358+
],
310359
"com.google.guava:guava": [
311360
"com.google.common.annotations",
312361
"com.google.common.base",
@@ -315,6 +364,7 @@
315364
"com.google.common.collect",
316365
"com.google.common.escape",
317366
"com.google.common.eventbus",
367+
"com.google.common.graph",
318368
"com.google.common.hash",
319369
"com.google.common.html",
320370
"com.google.common.io",
@@ -326,6 +376,9 @@
326376
"com.google.common.xml",
327377
"com.google.thirdparty.publicsuffix"
328378
],
379+
"com.google.j2objc:j2objc-annotations": [
380+
"com.google.j2objc.annotations"
381+
],
329382
"com.twitter:scrooge-core_2.12": [
330383
"com.twitter.scrooge",
331384
"com.twitter.scrooge.adapt",
@@ -449,39 +502,36 @@
449502
"org.apache.thrift.transport"
450503
],
451504
"org.checkerframework:checker-qual": [
505+
"org.checkerframework.checker.builder.qual",
506+
"org.checkerframework.checker.calledmethods.qual",
452507
"org.checkerframework.checker.compilermsgs.qual",
453508
"org.checkerframework.checker.fenum.qual",
454-
"org.checkerframework.checker.formatter",
455509
"org.checkerframework.checker.formatter.qual",
456510
"org.checkerframework.checker.guieffect.qual",
457511
"org.checkerframework.checker.i18n.qual",
458-
"org.checkerframework.checker.i18nformatter",
459512
"org.checkerframework.checker.i18nformatter.qual",
460513
"org.checkerframework.checker.index.qual",
461514
"org.checkerframework.checker.initialization.qual",
462515
"org.checkerframework.checker.interning.qual",
463516
"org.checkerframework.checker.lock.qual",
464-
"org.checkerframework.checker.nullness",
517+
"org.checkerframework.checker.mustcall.qual",
465518
"org.checkerframework.checker.nullness.qual",
466519
"org.checkerframework.checker.optional.qual",
467520
"org.checkerframework.checker.propkey.qual",
468-
"org.checkerframework.checker.regex",
469521
"org.checkerframework.checker.regex.qual",
470522
"org.checkerframework.checker.signature.qual",
471-
"org.checkerframework.checker.signedness",
472523
"org.checkerframework.checker.signedness.qual",
473524
"org.checkerframework.checker.tainting.qual",
474-
"org.checkerframework.checker.units",
475525
"org.checkerframework.checker.units.qual",
476526
"org.checkerframework.common.aliasing.qual",
527+
"org.checkerframework.common.initializedfields.qual",
477528
"org.checkerframework.common.reflection.qual",
478529
"org.checkerframework.common.returnsreceiver.qual",
479530
"org.checkerframework.common.subtyping.qual",
480531
"org.checkerframework.common.util.report.qual",
481532
"org.checkerframework.common.value.qual",
482533
"org.checkerframework.dataflow.qual",
483-
"org.checkerframework.framework.qual",
484-
"org.checkerframework.framework.util"
534+
"org.checkerframework.framework.qual"
485535
],
486536
"org.codehaus.plexus:plexus-utils": [
487537
"hidden.org.codehaus.plexus.interpolation",
@@ -575,8 +625,12 @@
575625
"com.github.scopt:scopt_2.12",
576626
"com.github.spullara.mustache.java:compiler",
577627
"com.google.code.findbugs:jsr305",
628+
"com.google.code.gson:gson",
578629
"com.google.errorprone:error_prone_annotations",
630+
"com.google.guava:failureaccess",
579631
"com.google.guava:guava",
632+
"com.google.guava:listenablefuture",
633+
"com.google.j2objc:j2objc-annotations",
580634
"com.twitter:scrooge-core_2.12",
581635
"com.twitter:scrooge-generator_2.12",
582636
"com.twitter:util-app-lifecycle_2.12",

0 commit comments

Comments
 (0)