Skip to content

Commit 1c20fef

Browse files
benjaminpbenjaminp
committed
Replace jar_sha256 with artifact_sha256.
1 parent 62e5d87 commit 1c20fef

File tree

10 files changed

+63
-64
lines changed

10 files changed

+63
-64
lines changed

‎jmh/jmh.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]):
88
_scala_maven_import_external(
99
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_core",
1010
artifact = "org.openjdk.jmh:jmh-core:1.20",
11-
jar_sha256 = "1688db5110ea6413bf63662113ed38084106ab1149e020c58c5ac22b91b842ca",
11+
artifact_sha256 = "1688db5110ea6413bf63662113ed38084106ab1149e020c58c5ac22b91b842ca",
1212
licenses = ["notice"],
1313
server_urls = maven_servers,
1414
)
@@ -19,7 +19,7 @@ def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]):
1919
_scala_maven_import_external(
2020
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm",
2121
artifact = "org.openjdk.jmh:jmh-generator-asm:1.20",
22-
jar_sha256 = "2dd4798b0c9120326310cda3864cc2e0035b8476346713d54a28d1adab1414a5",
22+
artifact_sha256 = "2dd4798b0c9120326310cda3864cc2e0035b8476346713d54a28d1adab1414a5",
2323
licenses = ["notice"],
2424
server_urls = maven_servers,
2525
)
@@ -30,7 +30,7 @@ def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]):
3030
_scala_maven_import_external(
3131
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection",
3232
artifact = "org.openjdk.jmh:jmh-generator-reflection:1.20",
33-
jar_sha256 = "57706f7c8278272594a9afc42753aaf9ba0ba05980bae0673b8195908d21204e",
33+
artifact_sha256 = "57706f7c8278272594a9afc42753aaf9ba0ba05980bae0673b8195908d21204e",
3434
licenses = ["notice"],
3535
server_urls = maven_servers,
3636
)
@@ -42,7 +42,7 @@ def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]):
4242
_scala_maven_import_external(
4343
name = "io_bazel_rules_scala_org_ows2_asm_asm",
4444
artifact = "org.ow2.asm:asm:6.1.1",
45-
jar_sha256 = "dd3b546415dd4bade2ebe3b47c7828ab0623ee2336604068e2d81023f9f8d833",
45+
artifact_sha256 = "dd3b546415dd4bade2ebe3b47c7828ab0623ee2336604068e2d81023f9f8d833",
4646
licenses = ["notice"],
4747
server_urls = maven_servers,
4848
)
@@ -53,7 +53,7 @@ def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]):
5353
_scala_maven_import_external(
5454
name = "io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple",
5555
artifact = "net.sf.jopt-simple:jopt-simple:5.0.3",
56-
jar_sha256 = "6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342",
56+
artifact_sha256 = "6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342",
5757
licenses = ["notice"],
5858
server_urls = maven_servers,
5959
)
@@ -65,7 +65,7 @@ def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]):
6565
_scala_maven_import_external(
6666
name = "io_bazel_rules_scala_org_apache_commons_commons_math3",
6767
artifact = "org.apache.commons:commons-math3:3.6.1",
68-
jar_sha256 = "1e56d7b058d28b65abd256b8458e3885b674c1d588fa43cd7d1cbb9c7ef2b308",
68+
artifact_sha256 = "1e56d7b058d28b65abd256b8458e3885b674c1d588fa43cd7d1cbb9c7ef2b308",
6969
licenses = ["notice"],
7070
server_urls = maven_servers,
7171
)

‎junit/junit.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def junit_repositories(maven_servers = ["http://central.maven.org/maven2"]):
77
_scala_maven_import_external(
88
name = "io_bazel_rules_scala_junit_junit",
99
artifact = "junit:junit:4.12",
10-
jar_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
10+
artifact_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
1111
licenses = ["notice"],
1212
server_urls = maven_servers,
1313
)
@@ -19,7 +19,7 @@ def junit_repositories(maven_servers = ["http://central.maven.org/maven2"]):
1919
_scala_maven_import_external(
2020
name = "io_bazel_rules_scala_org_hamcrest_hamcrest_core",
2121
artifact = "org.hamcrest:hamcrest-core:1.3",
22-
jar_sha256 = "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
22+
artifact_sha256 = "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
2323
licenses = ["notice"],
2424
server_urls = maven_servers,
2525
)

‎scala/scala.bzl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def scala_repositories(
437437
major_version = major_version,
438438
extra_jar_version = scala_version_extra_jars["scalatest"]["version"],
439439
),
440-
jar_sha256 = scala_version_extra_jars["scalatest"]["sha256"],
440+
artifact_sha256 = scala_version_extra_jars["scalatest"]["sha256"],
441441
licenses = ["notice"],
442442
server_urls = maven_servers,
443443
)
@@ -447,7 +447,7 @@ def scala_repositories(
447447
major_version = major_version,
448448
extra_jar_version = scala_version_extra_jars["scalactic"]["version"],
449449
),
450-
jar_sha256 = scala_version_extra_jars["scalactic"]["sha256"],
450+
artifact_sha256 = scala_version_extra_jars["scalactic"]["sha256"],
451451
licenses = ["notice"],
452452
server_urls = maven_servers,
453453
)
@@ -458,7 +458,7 @@ def scala_repositories(
458458
major_version = major_version,
459459
extra_jar_version = scala_version_extra_jars["scala_xml"]["version"],
460460
),
461-
jar_sha256 = scala_version_extra_jars["scala_xml"]["sha256"],
461+
artifact_sha256 = scala_version_extra_jars["scala_xml"]["sha256"],
462462
licenses = ["notice"],
463463
server_urls = maven_servers,
464464
)
@@ -470,7 +470,7 @@ def scala_repositories(
470470
major_version = major_version,
471471
extra_jar_version = scala_version_extra_jars["scala_parser_combinators"]["version"],
472472
),
473-
jar_sha256 = scala_version_extra_jars["scala_parser_combinators"]["sha256"],
473+
artifact_sha256 = scala_version_extra_jars["scala_parser_combinators"]["sha256"],
474474
licenses = ["notice"],
475475
server_urls = maven_servers,
476476
)
@@ -479,31 +479,31 @@ def scala_repositories(
479479
_scala_maven_import_external(
480480
name = "scalac_rules_commons_io",
481481
artifact = "commons-io:commons-io:2.6",
482-
jar_sha256 = "f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513",
482+
artifact_sha256 = "f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513",
483483
licenses = ["notice"],
484484
server_urls = maven_servers,
485485
)
486486

487487
_scala_maven_import_external(
488488
name = "io_bazel_rules_scala_guava",
489489
artifact = "com.google.guava:guava:21.0",
490-
jar_sha256 = "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480",
490+
artifact_sha256 = "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480",
491491
licenses = ["notice"],
492492
server_urls = maven_servers,
493493
)
494494

495495
_scala_maven_import_external(
496496
name = "io_bazel_rules_scala_org_jacoco_org_jacoco_core",
497497
artifact = "org.jacoco:org.jacoco.core:0.7.5.201505241946",
498-
jar_sha256 = "ecf1ad8192926438d0748bfcc3f09bebc7387d2a4184bb3a171a26084677e808",
498+
artifact_sha256 = "ecf1ad8192926438d0748bfcc3f09bebc7387d2a4184bb3a171a26084677e808",
499499
licenses = ["notice"],
500500
server_urls = maven_servers,
501501
)
502502

503503
_scala_maven_import_external(
504504
name = "io_bazel_rules_scala_org_ow2_asm_asm_debug_all",
505505
artifact = "org.ow2.asm:asm-debug-all:5.0.1",
506-
jar_sha256 = "4734de5b515a454b0096db6971fb068e5f70e6f10bbee2b3bd2fdfe5d978ed57",
506+
artifact_sha256 = "4734de5b515a454b0096db6971fb068e5f70e6f10bbee2b3bd2fdfe5d978ed57",
507507
licenses = ["notice"],
508508
server_urls = maven_servers,
509509
)

‎scala/scala_cross_version.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ def new_scala_default_repository(
6060
_scala_maven_import_external(
6161
name = "io_bazel_rules_scala_scala_library",
6262
artifact = "org.scala-lang:scala-library:{}".format(scala_version),
63-
jar_sha256 = scala_version_jar_shas["scala_library"],
63+
artifact_sha256 = scala_version_jar_shas["scala_library"],
6464
licenses = ["notice"],
6565
server_urls = maven_servers,
6666
)
6767
_scala_maven_import_external(
6868
name = "io_bazel_rules_scala_scala_compiler",
6969
artifact = "org.scala-lang:scala-compiler:{}".format(scala_version),
70-
jar_sha256 = scala_version_jar_shas["scala_compiler"],
70+
artifact_sha256 = scala_version_jar_shas["scala_compiler"],
7171
licenses = ["notice"],
7272
server_urls = maven_servers,
7373
)
7474
_scala_maven_import_external(
7575
name = "io_bazel_rules_scala_scala_reflect",
7676
artifact = "org.scala-lang:scala-reflect:{}".format(scala_version),
77-
jar_sha256 = scala_version_jar_shas["scala_reflect"],
77+
artifact_sha256 = scala_version_jar_shas["scala_reflect"],
7878
licenses = ["notice"],
7979
server_urls = maven_servers,
8080
)

‎scala/scala_maven_import_external.bzl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ java_import_external(
382382
"http://repo1.maven.org/maven2/com/google/guava/guava/20.0/guava-20.0.jar",
383383
"http://maven.ibiblio.org/maven2/com/google/guava/guava/20.0/guava-20.0.jar",
384384
],
385-
jar_sha256 = "36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8",
385+
artifact_sha256 = "36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8",
386386
deps = [
387387
"@com_google_code_findbugs_jsr305",
388388
"@com_google_errorprone_error_prone_annotations",
@@ -397,13 +397,13 @@ java_import_external(
397397
"http://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar",
398398
"http://maven.ibiblio.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar",
399399
],
400-
jar_sha256 = "905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed",
400+
artifact_sha256 = "905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed",
401401
)
402402
403403
java_import_external(
404404
name = "com_google_errorprone_error_prone_annotations",
405405
licenses = ["notice"], # Apache 2.0
406-
jar_sha256 = "e7749ffdf03fb8ebe08a727ea205acb301c8791da837fee211b99b04f9d79c46",
406+
artifact_sha256 = "e7749ffdf03fb8ebe08a727ea205acb301c8791da837fee211b99b04f9d79c46",
407407
jar_urls = [
408408
"http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.0.15/error_prone_annotations-2.0.15.jar",
409409
"http://maven.ibiblio.org/maven2/com/google/errorprone/error_prone_annotations/2.0.15/error_prone_annotations-2.0.15.jar",
@@ -440,9 +440,8 @@ will be loaded into a runtime environment where certain dependencies can be
440440
reasonably expected to already be provided.
441441
"""
442442

443-
def java_import_external(jar_sha256, **kwargs):
443+
def java_import_external(**kwargs):
444444
jvm_import_external(
445445
rule_name = "java_import",
446-
jar_sha256 = jar_sha256,
447446
**kwargs
448447
)

0 commit comments

Comments
 (0)