diff --git a/MODULE.bazel b/MODULE.bazel index 389809673..bbbe11601 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -45,6 +45,7 @@ single_version_override( version = "8.16.1", ) +bazel_dep(name = "rules_jvm_external", version = "6.8") bazel_dep(name = "rules_proto", version = "6.0.0") single_version_override( module_name = "rules_proto", @@ -186,27 +187,28 @@ use_repo( for scala_version in SCALA_3_VERSIONS ] -internal_dev_deps = use_extension( - "//scala/private/extensions:dev_deps.bzl", - "dev_deps", - dev_dependency = True, -) - -# See //scala/private:extensions/dev_deps.bzl for notes on some of these repos. -use_repo( - internal_dev_deps, - "com_github_bazelbuild_buildtools", - "com_github_jnr_jffi_native", - "com_google_guava_guava_21_0", - "com_google_guava_guava_21_0_with_file", - "com_twitter__scalding_date", - "org_apache_commons_commons_lang_3_5", - "org_apache_commons_commons_lang_3_5_without_file", - "org_springframework_spring_core", - "org_springframework_spring_tx", - "org_typelevel__cats_core", - "org_typelevel_kind_projector", +rules_scala_test_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") +rules_scala_test_maven.install( + name = "rules_scala_test_maven", + artifacts = [ + "com.github.jnr:jffi:1.3.13", + "com.google.guava:guava:21.0", + "org.apache.commons:commons-lang3:3.18.0", + "org.springframework:spring-core:6.2.11", + "org.springframework:spring-tx:6.2.11", + "org.typelevel:cats-core_2.12:2.13.0", + "org.typelevel:kind-projector_2.12.20:0.13.4", + ], + fetch_sources = True, + lock_file = "//:rules_scala_test_maven.json", + repositories = [ + "https://repo.maven.apache.org/maven2", + "https://maven-central.storage-download.googleapis.com/maven2", + "https://mirror.bazel.build/repo1.maven.org/maven2", + "https://jcenter.bintray.com", + ], ) +use_repo(rules_scala_test_maven, "rules_scala_test_maven") java_toolchains = use_extension( "@rules_java//java:extensions.bzl", @@ -255,54 +257,6 @@ bazel_dep( dev_dependency = True, repo_name = "bazelci_rules", ) -bazel_dep( - name = "rules_go", - version = "0.58.2", - dev_dependency = True, - repo_name = "io_bazel_rules_go", # for com_github_bazelbuild_buildtools -) -bazel_dep(name = "gazelle", version = "0.45.0", dev_dependency = True) - -go_sdk = use_extension( - "@io_bazel_rules_go//go:extensions.bzl", - "go_sdk", - dev_dependency = True, -) -go_sdk.download(version = "1.25.3") - -go_deps = use_extension( - "@gazelle//:extensions.bzl", - "go_deps", - dev_dependency = True, -) - -# The go_deps.module calls are inspired by the following to get the -# com_github_bazelbuild_buildtools repo to work: -# -# - https://github.com/bazelbuild/bazel-central-registry/blob/main/modules/gazelle/0.39.1/MODULE.bazel#L31-L57 -# -# To get the latest version and hashes for each per: -# -# - https://go.dev/ref/mod#go-list-m -# - https://go.dev/ref/mod#checksum-database -# -# go list -m golang.org/x/tools@latest -# curl https://sum.golang.org/lookup/golang.org/x/tools@v0.38.0 -go_deps.module( - path = "golang.org/x/tools", - sum = "h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=", - version = "v0.38.0", -) -go_deps.module( - path = "github.com/golang/protobuf", - sum = "h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=", - version = "v1.5.4", -) -use_repo( - go_deps, - "com_github_golang_protobuf", - "org_golang_x_tools", -) - +bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2", dev_dependency = True) bazel_dep(name = "rules_python", version = "1.6.3", dev_dependency = True) bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index e5307e400..94979cf27 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -15,7 +15,6 @@ "https://bcr.bazel.build/modules/apple_support/1.23.1/source.json": "d888b44312eb0ad2c21a91d026753f330caa48a25c9b2102fae75eb2b0dcfdd2", "https://bcr.bazel.build/modules/bazel_ci_rules/1.0.0/MODULE.bazel": "0f92c944b9c466066ed484cfc899cf43fca765df78caca18984c62479f7925eb", "https://bcr.bazel.build/modules/bazel_ci_rules/1.0.0/source.json": "3405a2a7f9f827a44934b01470faeac1b56fb1304955c98ee9fcd03ad2ca5dcc", - "https://bcr.bazel.build/modules/bazel_features/1.1.0/MODULE.bazel": "cfd42ff3b815a5f39554d97182657f8c4b9719568eb7fded2b9135f084bf760b", "https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd", "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8", "https://bcr.bazel.build/modules/bazel_features/1.15.0/MODULE.bazel": "d38ff6e517149dc509406aca0db3ad1efdd890a85e049585b7234d04238e2a4d", @@ -34,14 +33,10 @@ "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/source.json": "34a3c8bcf233b835eb74be9d628899bb32999d3e0eadef1947a0a562a2b16ffb", "https://bcr.bazel.build/modules/bazel_worker_api/0.0.6/MODULE.bazel": "fd1f9432ca04c947e91b500df69ce7c5b6dbfe1bc45ab1820338205dae3383a6", "https://bcr.bazel.build/modules/bazel_worker_api/0.0.6/source.json": "5d68545f224904745a3cabd35aea6bc2b6cc5a78b7f49f3f69660eab2eeeb273", + "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "a9b689711d5b69f9db741649b218c119b9fdf82924ba390415037e09798edd03", + "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/source.json": "51eb0a4b38aaaeab7fa64361576d616c4d8bfd0f17a0a10184aeab7084d79f8e", "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84", "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8", - "https://bcr.bazel.build/modules/gazelle/0.32.0/MODULE.bazel": "b499f58a5d0d3537f3cf5b76d8ada18242f64ec474d8391247438bf04f58c7b8", - "https://bcr.bazel.build/modules/gazelle/0.33.0/MODULE.bazel": "a13a0f279b462b784fb8dd52a4074526c4a2afe70e114c7d09066097a46b3350", - "https://bcr.bazel.build/modules/gazelle/0.34.0/MODULE.bazel": "abdd8ce4d70978933209db92e436deb3a8b737859e9354fb5fd11fb5c2004c8a", - "https://bcr.bazel.build/modules/gazelle/0.36.0/MODULE.bazel": "e375d5d6e9a6ca59b0cb38b0540bc9a05b6aa926d322f2de268ad267a2ee74c0", - "https://bcr.bazel.build/modules/gazelle/0.45.0/MODULE.bazel": "ecd19ebe9f8e024e1ccffb6d997cc893a974bcc581f1ae08f386bdd448b10687", - "https://bcr.bazel.build/modules/gazelle/0.45.0/source.json": "111d182facc5f5e80f0b823d5f077b74128f40c3fd2eccc89a06f34191bd3392", "https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb", "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6", "https://bcr.bazel.build/modules/googletest/1.14.0/MODULE.bazel": "cfbcbf3e6eac06ef9d85900f64424708cc08687d1b527f0ef65aa7517af8118f", @@ -53,8 +48,6 @@ "https://bcr.bazel.build/modules/libpfm/4.11.0/MODULE.bazel": "45061ff025b301940f1e30d2c16bea596c25b176c8b6b3087e92615adbd52902", "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/MODULE.bazel": "6f7b417dcc794d9add9e556673ad25cb3ba835224290f4f848f8e2db1e1fca74", "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/source.json": "f448c6e8963fdfa7eb831457df83ad63d3d6355018f6574fb017e8169deb43a9", - "https://bcr.bazel.build/modules/package_metadata/0.0.5/MODULE.bazel": "ef4f9439e3270fdd6b9fd4dbc3d2f29d13888e44c529a1b243f7a31dfbc2e8e4", - "https://bcr.bazel.build/modules/package_metadata/0.0.5/source.json": "2326db2f6592578177751c3e1f74786b79382cd6008834c9d01ec865b9126a85", "https://bcr.bazel.build/modules/platforms/1.0.0/MODULE.bazel": "f05feb42b48f1b3c225e4ccf351f367be0371411a803198ec34a389fb22aa580", "https://bcr.bazel.build/modules/platforms/1.0.0/source.json": "f4ff1fd412e0246fd38c82328eb209130ead81d62dcd5a9e40910f867f733d96", "https://bcr.bazel.build/modules/protobuf/33.0/MODULE.bazel": "c5270efb4aad37a2f893536076518793f409ea7df07a06df995d848d1690f21c", @@ -79,22 +72,16 @@ "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5", "https://bcr.bazel.build/modules/rules_cc/0.1.1/MODULE.bazel": "2f0222a6f229f0bf44cd711dc13c858dad98c62d52bd51d8fc3a764a83125513", - "https://bcr.bazel.build/modules/rules_cc/0.1.5/MODULE.bazel": "88dfc9361e8b5ae1008ac38f7cdfd45ad738e4fa676a3ad67d19204f045a1fd8", "https://bcr.bazel.build/modules/rules_cc/0.2.0/MODULE.bazel": "b5c17f90458caae90d2ccd114c81970062946f49f355610ed89bebf954f5783c", "https://bcr.bazel.build/modules/rules_cc/0.2.8/MODULE.bazel": "f1df20f0bf22c28192a794f29b501ee2018fa37a3862a1a2132ae2940a23a642", "https://bcr.bazel.build/modules/rules_cc/0.2.8/source.json": "85087982aca15f31307bd52698316b28faa31bd2c3095a41f456afec0131344c", "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6", - "https://bcr.bazel.build/modules/rules_go/0.41.0/MODULE.bazel": "55861d8e8bb0e62cbd2896f60ff303f62ffcb0eddb74ecb0e5c0cbe36fc292c8", - "https://bcr.bazel.build/modules/rules_go/0.42.0/MODULE.bazel": "8cfa875b9aa8c6fce2b2e5925e73c1388173ea3c32a0db4d2b4804b453c14270", - "https://bcr.bazel.build/modules/rules_go/0.46.0/MODULE.bazel": "3477df8bdcc49e698b9d25f734c4f3a9f5931ff34ee48a2c662be168f5f2d3fd", - "https://bcr.bazel.build/modules/rules_go/0.53.0/MODULE.bazel": "a4ed760d3ac0dbc0d7b967631a9a3fd9100d28f7d9fcf214b4df87d4bfff5f9a", - "https://bcr.bazel.build/modules/rules_go/0.58.2/MODULE.bazel": "baebed8067d059e50bb03d56a37ea975cb4830d78fd40b8d6b0b53ba267c664d", - "https://bcr.bazel.build/modules/rules_go/0.58.2/source.json": "90bb77dd3105fc3ac26d961a7d7969408c1a4952b0226ecb3fbe76d576b1a077", "https://bcr.bazel.build/modules/rules_java/8.16.1/MODULE.bazel": "0f20b1cecaa8e52f60a8f071e59a20b4e3b9a67f6c56c802ea256f6face692d3", "https://bcr.bazel.build/modules/rules_java/8.16.1/source.json": "072f8d11264edc499621be2dc9ea01d6395db5aa6f8799c034ae01a3e857f2e4", "https://bcr.bazel.build/modules/rules_jvm_external/6.3/MODULE.bazel": "c998e060b85f71e00de5ec552019347c8bca255062c990ac02d051bb80a38df0", "https://bcr.bazel.build/modules/rules_jvm_external/6.7/MODULE.bazel": "e717beabc4d091ecb2c803c2d341b88590e9116b8bf7947915eeb33aab4f96dd", - "https://bcr.bazel.build/modules/rules_jvm_external/6.7/source.json": "5426f412d0a7fc6b611643376c7e4a82dec991491b9ce5cb1cfdd25fe2e92be4", + "https://bcr.bazel.build/modules/rules_jvm_external/6.8/MODULE.bazel": "b5afe861e867e4c8e5b88e401cb7955bd35924258f97b1862cc966cbcf4f1a62", + "https://bcr.bazel.build/modules/rules_jvm_external/6.8/source.json": "c85e553d5ac17f7825cd85b9cceb500c64f9e44f0e93c7887469e430c4ae9eff", "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/MODULE.bazel": "d269a01a18ee74d0335450b10f62c9ed81f2321d7958a2934e44272fe82dcef3", "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/source.json": "2faa4794364282db7c06600b7e5e34867a564ae91bda7cae7c29c64e9466b7d5", "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0", diff --git a/WORKSPACE b/WORKSPACE index c591c9907..0547671e4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -104,25 +104,6 @@ local_repository( path = "third_party/test/example_external_workspace", ) -http_archive( - name = "io_bazel_rules_go", - sha256 = "54bbb67a4196170cc60ef3b52a2747ad1759cba4764b4c4752b744080ad99947", - urls = [ - "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.58.2/rules_go-v0.58.2.zip", - "https://github.com/bazel-contrib/rules_go/releases/download/v0.58.2/rules_go-v0.58.2.zip", - ], -) - -load( - "@io_bazel_rules_go//go:deps.bzl", - "go_register_toolchains", - "go_rules_dependencies", -) - -go_rules_dependencies() - -go_register_toolchains(version = "1.25.3") - http_archive( name = "bazelci_rules", sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e", @@ -132,15 +113,28 @@ http_archive( load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig") +buildifier_prebuilt_version = "8.2.0.2" + +http_archive( + name = "buildifier_prebuilt", + sha256 = "f98dd3d8f32661629b8cab11f02d7730bb8e03bd8af09dbbb268047889c8ff10", + strip_prefix = "buildifier-prebuilt-{}".format(buildifier_prebuilt_version), + urls = ["http://github.com/keith/buildifier-prebuilt/archive/{}.tar.gz".format(buildifier_prebuilt_version)], +) + +load("@buildifier_prebuilt//:deps.bzl", "buildifier_prebuilt_deps") + +buildifier_prebuilt_deps() + +load("@buildifier_prebuilt//:defs.bzl", "buildifier_prebuilt_register_toolchains") + +buildifier_prebuilt_register_toolchains() + rbe_preconfig( name = "rbe_default", toolchain = "ubuntu2004-bazel-java11", ) -load("//scala/private/extensions:dev_deps.bzl", "dev_deps_repositories") - -dev_deps_repositories() - register_toolchains("//test/toolchains:java21_toolchain_definition") load( @@ -152,3 +146,47 @@ load( rules_shell_dependencies() rules_shell_toolchains() + +rules_jvm_external_version = "6.8" + +http_archive( + name = "rules_jvm_external", + strip_prefix = "rules_jvm_external-%s" % rules_jvm_external_version, + sha256 = "704a0197e4e966f96993260418f2542568198490456c21814f647ae7091f56f2", + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % rules_jvm_external_version, +) + +load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") + +rules_jvm_external_deps() + +load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") + +rules_jvm_external_setup() + +load("@rules_jvm_external//:defs.bzl", "maven_install") + +maven_install( + name = "rules_scala_test_maven", + artifacts = [ + "com.github.jnr:jffi:1.3.13", + "com.google.guava:guava:21.0", + "org.apache.commons:commons-lang3:3.18.0", + "org.springframework:spring-core:6.2.11", + "org.springframework:spring-tx:6.2.11", + "org.typelevel:cats-core_2.12:2.13.0", + "org.typelevel:kind-projector_2.12.20:0.13.4", + ], + fetch_sources = True, + maven_install_json = "//:rules_scala_test_maven.json", + repositories = [ + "https://repo.maven.apache.org/maven2", + "https://maven-central.storage-download.googleapis.com/maven2", + "https://mirror.bazel.build/repo1.maven.org/maven2", + "https://jcenter.bintray.com", + ], +) + +load("@rules_scala_test_maven//:defs.bzl", "pinned_maven_install") + +pinned_maven_install() diff --git a/examples/twitter_scrooge/MODULE.bazel b/examples/twitter_scrooge/MODULE.bazel index 64ea63bd7..74abd6afe 100644 --- a/examples/twitter_scrooge/MODULE.bazel +++ b/examples/twitter_scrooge/MODULE.bazel @@ -24,7 +24,7 @@ single_version_override( version = "33.0", ) -bazel_dep(name = "rules_jvm_external", version = "6.7") +bazel_dep(name = "rules_jvm_external", version = "6.8") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/examples/twitter_scrooge/maven_install.json b/examples/twitter_scrooge/maven_install.json index cc59e35d4..952e661d5 100755 --- a/examples/twitter_scrooge/maven_install.json +++ b/examples/twitter_scrooge/maven_install.json @@ -1,7 +1,10 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1947796996, - "__RESOLVED_ARTIFACTS_HASH": -1477454183, + "__INPUT_ARTIFACTS_HASH": 1443541980, + "__RESOLVED_ARTIFACTS_HASH": -952461148, + "conflict_resolution": { + "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.18.0" + }, "artifacts": { "com.github.ben-manes.caffeine:caffeine": { "shasums": { @@ -23,21 +26,45 @@ }, "com.google.code.findbugs:jsr305": { "shasums": { - "jar": "1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468" + "jar": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7" + }, + "version": "3.0.2" + }, + "com.google.code.gson:gson": { + "shasums": { + "jar": "d3999291855de495c94c743761b8ab5176cfeabe281a5ab0d8e8d45326fd703e" }, - "version": "2.0.1" + "version": "2.8.9" }, "com.google.errorprone:error_prone_annotations": { "shasums": { - "jar": "5f2a0648230a662e8be049df308d583d7369f13af683e44ddf5829b6d741a228" + "jar": "9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae" }, - "version": "2.4.0" + "version": "2.18.0" + }, + "com.google.guava:failureaccess": { + "shasums": { + "jar": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" + }, + "version": "1.0.1" }, "com.google.guava:guava": { "shasums": { - "jar": "a896857d07845d38c7dc5bbc0457b6d9b0f62ecffda010e5e9ec12d561f676d3" + "jar": "bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5" }, - "version": "16.0.1" + "version": "32.0.1-jre" + }, + "com.google.guava:listenablefuture": { + "shasums": { + "jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99" + }, + "version": "9999.0-empty-to-avoid-conflict-with-guava" + }, + "com.google.j2objc:j2objc-annotations": { + "shasums": { + "jar": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed" + }, + "version": "2.8" }, "com.twitter:scrooge-core_2.12": { "shasums": { @@ -143,9 +170,9 @@ }, "org.checkerframework:checker-qual": { "shasums": { - "jar": "bce5c887460542d69c0ffce05919fef8f56f9964a1505a99f6ae69a58351507e" + "jar": "e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1" }, - "version": "3.4.1" + "version": "3.33.0" }, "org.codehaus.plexus:plexus-utils": { "shasums": { @@ -195,6 +222,14 @@ "com.github.spullara.mustache.java:compiler": [ "com.google.guava:guava" ], + "com.google.guava:guava": [ + "com.google.code.findbugs:jsr305", + "com.google.errorprone:error_prone_annotations", + "com.google.guava:failureaccess", + "com.google.guava:listenablefuture", + "com.google.j2objc:j2objc-annotations", + "org.checkerframework:checker-qual" + ], "com.twitter:scrooge-core_2.12": [ "com.twitter:util-core_2.12", "javax.annotation:javax.annotation-api", @@ -303,10 +338,24 @@ "javax.annotation.concurrent", "javax.annotation.meta" ], + "com.google.code.gson:gson": [ + "com.google.gson", + "com.google.gson.annotations", + "com.google.gson.internal", + "com.google.gson.internal.bind", + "com.google.gson.internal.bind.util", + "com.google.gson.internal.reflect", + "com.google.gson.internal.sql", + "com.google.gson.reflect", + "com.google.gson.stream" + ], "com.google.errorprone:error_prone_annotations": [ "com.google.errorprone.annotations", "com.google.errorprone.annotations.concurrent" ], + "com.google.guava:failureaccess": [ + "com.google.common.util.concurrent.internal" + ], "com.google.guava:guava": [ "com.google.common.annotations", "com.google.common.base", @@ -315,6 +364,7 @@ "com.google.common.collect", "com.google.common.escape", "com.google.common.eventbus", + "com.google.common.graph", "com.google.common.hash", "com.google.common.html", "com.google.common.io", @@ -326,6 +376,9 @@ "com.google.common.xml", "com.google.thirdparty.publicsuffix" ], + "com.google.j2objc:j2objc-annotations": [ + "com.google.j2objc.annotations" + ], "com.twitter:scrooge-core_2.12": [ "com.twitter.scrooge", "com.twitter.scrooge.adapt", @@ -449,39 +502,36 @@ "org.apache.thrift.transport" ], "org.checkerframework:checker-qual": [ + "org.checkerframework.checker.builder.qual", + "org.checkerframework.checker.calledmethods.qual", "org.checkerframework.checker.compilermsgs.qual", "org.checkerframework.checker.fenum.qual", - "org.checkerframework.checker.formatter", "org.checkerframework.checker.formatter.qual", "org.checkerframework.checker.guieffect.qual", "org.checkerframework.checker.i18n.qual", - "org.checkerframework.checker.i18nformatter", "org.checkerframework.checker.i18nformatter.qual", "org.checkerframework.checker.index.qual", "org.checkerframework.checker.initialization.qual", "org.checkerframework.checker.interning.qual", "org.checkerframework.checker.lock.qual", - "org.checkerframework.checker.nullness", + "org.checkerframework.checker.mustcall.qual", "org.checkerframework.checker.nullness.qual", "org.checkerframework.checker.optional.qual", "org.checkerframework.checker.propkey.qual", - "org.checkerframework.checker.regex", "org.checkerframework.checker.regex.qual", "org.checkerframework.checker.signature.qual", - "org.checkerframework.checker.signedness", "org.checkerframework.checker.signedness.qual", "org.checkerframework.checker.tainting.qual", - "org.checkerframework.checker.units", "org.checkerframework.checker.units.qual", "org.checkerframework.common.aliasing.qual", + "org.checkerframework.common.initializedfields.qual", "org.checkerframework.common.reflection.qual", "org.checkerframework.common.returnsreceiver.qual", "org.checkerframework.common.subtyping.qual", "org.checkerframework.common.util.report.qual", "org.checkerframework.common.value.qual", "org.checkerframework.dataflow.qual", - "org.checkerframework.framework.qual", - "org.checkerframework.framework.util" + "org.checkerframework.framework.qual" ], "org.codehaus.plexus:plexus-utils": [ "hidden.org.codehaus.plexus.interpolation", @@ -575,8 +625,12 @@ "com.github.scopt:scopt_2.12", "com.github.spullara.mustache.java:compiler", "com.google.code.findbugs:jsr305", + "com.google.code.gson:gson", "com.google.errorprone:error_prone_annotations", + "com.google.guava:failureaccess", "com.google.guava:guava", + "com.google.guava:listenablefuture", + "com.google.j2objc:j2objc-annotations", "com.twitter:scrooge-core_2.12", "com.twitter:scrooge-generator_2.12", "com.twitter:util-app-lifecycle_2.12", diff --git a/rules_scala_test_maven.json b/rules_scala_test_maven.json new file mode 100644 index 000000000..3bdc11bed --- /dev/null +++ b/rules_scala_test_maven.json @@ -0,0 +1,607 @@ +{ + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", + "__INPUT_ARTIFACTS_HASH": 1659901293, + "__RESOLVED_ARTIFACTS_HASH": 1080635870, + "artifacts": { + "com.github.jnr:jffi": { + "shasums": { + "jar": "78df5fb05d7e2541b867bedc538b18840245a601bb2160fa26824bb67ed93878", + "sources": "2e025a0ab78cdbee63243d58ca96dd1458f14a7d365800413b525fe2557b9685" + }, + "version": "1.3.13" + }, + "com.google.guava:guava": { + "shasums": { + "jar": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", + "sources": "b186965c9af0a714632fe49b33378c9670f8f074797ab466f49a67e918e116ea" + }, + "version": "21.0" + }, + "org.apache.commons:commons-lang3": { + "shasums": { + "jar": "4eeeae8d20c078abb64b015ec158add383ac581571cddc45c68f0c9ae0230720", + "sources": "b15732a13e40df7f07c30f2cb8572874798e8dde581f1398943d2ad3765bafaa" + }, + "version": "3.18.0" + }, + "org.scala-lang.modules:scala-xml_2.12": { + "shasums": { + "jar": "4932c56a2d5aae77ae8d7ac6bed1f21d48268fdbac8b4e5f3ca5196ad10fd93e", + "sources": "bb93b2fdcd36ebd3e7e6e6de961cd2a4ead3815c9565c7be5cad860cf3d8c81c" + }, + "version": "2.3.0" + }, + "org.scala-lang:scala-compiler": { + "shasums": { + "jar": "c88676d75c69721b717ea6c441ece04fff262abab9d210a2936abc2be3731fa2", + "sources": "07c140c8187a7bcbcfce7509eb4f1704fcbfa12ad3c7798f8ddcab9477dc5028" + }, + "version": "2.12.20" + }, + "org.scala-lang:scala-library": { + "shasums": { + "jar": "4d8a8f984cce31a329a24f10b0bf336f042cb62aeb435290a1b20243154cfccb", + "sources": "c64cc0d241cc7515240d55aac05213c8c518940a1ccf229c90b8f43bcf3c38ee" + }, + "version": "2.12.20" + }, + "org.scala-lang:scala-reflect": { + "shasums": { + "jar": "5f1914cdc7a70580ea6038d929ebb25736ecf2234f677e2d47f8a4b2bc81e1fb", + "sources": "1add39697b43c4e967c79c2dfa5a1eca493e56dc66fd14d7566f8e2c306c65fa" + }, + "version": "2.12.20" + }, + "org.springframework:spring-beans": { + "shasums": { + "jar": "f9ba5dedee94947b11d930209ff1a12bbe9e28b1b4f73c5baeba2fb3fe32d08e", + "sources": "f5fcf8046c9f5e0ef7cd183d2ac6b0e5d23cd7f27c174234243c71a5e6399c75" + }, + "version": "6.2.11" + }, + "org.springframework:spring-core": { + "shasums": { + "jar": "a1de6ff2d88c05442468360b89f881b77ff7a393b8cd5b1d5758756b2e247f8a", + "sources": "64908fcf3859ace781eadc1793ecb40cfc5e5307774603c158eb2fb960ba1bcc" + }, + "version": "6.2.11" + }, + "org.springframework:spring-jcl": { + "shasums": { + "jar": "a5d92923b658637c62c481dc44eab029afc1b816b10d8d0fda5ed63715f3cf85", + "sources": "933fee6c9ba073b2c0d1c789c067ba1b94ed3fe43ab90cd0b20aa8f7d81593d7" + }, + "version": "6.2.11" + }, + "org.springframework:spring-tx": { + "shasums": { + "jar": "dd7eb3514a51c91e565a4ca1e7b170f7513b4da56d6f7821ac84cb32dc4fbb16", + "sources": "5bce4cca6d36e0f9d48b64d4e257e37d176545d718b51acba89f6ffc542b034c" + }, + "version": "6.2.11" + }, + "org.typelevel:cats-core_2.12": { + "shasums": { + "jar": "4b92d574b01cf448018707de8bf20a2c37d0f6c6bd657a0f3c1be762761a310e", + "sources": "f30a76f7ef5bdfc52e115a2a9e4d879b308860cce1caee0db1506d5a9ae32378" + }, + "version": "2.13.0" + }, + "org.typelevel:cats-kernel_2.12": { + "shasums": { + "jar": "daeb592b533bd9d6400aac1397d780ff22ca672e98f4dc69c08fd0ceba3fa0ed", + "sources": "af64332038484424a41a8c3eec2e6cfb70eba89b9f0439f2e52e6a89ea2b8625" + }, + "version": "2.13.0" + }, + "org.typelevel:kind-projector_2.12.20": { + "shasums": { + "jar": "56777b7286c6013c6761fba538abc37274c7aa902a00933acd1e6f6e52d5268a", + "sources": "8bbb2471ab188e56fd0e3c62b0f18d92ffd4ee4fadcd12b9190c9cc26659e5fa" + }, + "version": "0.13.4" + } + }, + "dependencies": { + "org.scala-lang:scala-compiler": [ + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang:scala-library", + "org.scala-lang:scala-reflect" + ], + "org.scala-lang:scala-reflect": [ + "org.scala-lang:scala-library" + ], + "org.springframework:spring-beans": [ + "org.springframework:spring-core" + ], + "org.springframework:spring-core": [ + "org.springframework:spring-jcl" + ], + "org.springframework:spring-tx": [ + "org.springframework:spring-beans", + "org.springframework:spring-core" + ], + "org.typelevel:cats-core_2.12": [ + "org.scala-lang:scala-library", + "org.typelevel:cats-kernel_2.12" + ], + "org.typelevel:cats-kernel_2.12": [ + "org.scala-lang:scala-library" + ], + "org.typelevel:kind-projector_2.12.20": [ + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-library" + ] + }, + "packages": { + "com.github.jnr:jffi": [ + "com.kenai.jffi", + "com.kenai.jffi.internal" + ], + "com.google.guava:guava": [ + "com.google.common.annotations", + "com.google.common.base", + "com.google.common.base.internal", + "com.google.common.cache", + "com.google.common.collect", + "com.google.common.escape", + "com.google.common.eventbus", + "com.google.common.graph", + "com.google.common.hash", + "com.google.common.html", + "com.google.common.io", + "com.google.common.math", + "com.google.common.net", + "com.google.common.primitives", + "com.google.common.reflect", + "com.google.common.util.concurrent", + "com.google.common.xml", + "com.google.thirdparty.publicsuffix" + ], + "org.apache.commons:commons-lang3": [ + "org.apache.commons.lang3", + "org.apache.commons.lang3.arch", + "org.apache.commons.lang3.builder", + "org.apache.commons.lang3.compare", + "org.apache.commons.lang3.concurrent", + "org.apache.commons.lang3.concurrent.locks", + "org.apache.commons.lang3.event", + "org.apache.commons.lang3.exception", + "org.apache.commons.lang3.function", + "org.apache.commons.lang3.math", + "org.apache.commons.lang3.mutable", + "org.apache.commons.lang3.reflect", + "org.apache.commons.lang3.stream", + "org.apache.commons.lang3.text", + "org.apache.commons.lang3.text.translate", + "org.apache.commons.lang3.time", + "org.apache.commons.lang3.tuple", + "org.apache.commons.lang3.util" + ], + "org.scala-lang.modules:scala-xml_2.12": [ + "scala.xml", + "scala.xml.dtd", + "scala.xml.dtd.impl", + "scala.xml.factory", + "scala.xml.include", + "scala.xml.include.sax", + "scala.xml.parsing", + "scala.xml.transform" + ], + "org.scala-lang:scala-compiler": [ + "scala.reflect.macros.compiler", + "scala.reflect.macros.contexts", + "scala.reflect.macros.runtime", + "scala.reflect.macros.util", + "scala.reflect.quasiquotes", + "scala.reflect.reify", + "scala.reflect.reify.codegen", + "scala.reflect.reify.phases", + "scala.reflect.reify.utils", + "scala.tools.ant", + "scala.tools.ant.sabbus", + "scala.tools.asm", + "scala.tools.asm.commons", + "scala.tools.asm.signature", + "scala.tools.asm.tree", + "scala.tools.asm.tree.analysis", + "scala.tools.asm.util", + "scala.tools.cmd", + "scala.tools.fusesource_embedded.hawtjni.runtime", + "scala.tools.fusesource_embedded.jansi", + "scala.tools.fusesource_embedded.jansi.internal", + "scala.tools.jline_embedded", + "scala.tools.jline_embedded.console", + "scala.tools.jline_embedded.console.completer", + "scala.tools.jline_embedded.console.history", + "scala.tools.jline_embedded.internal", + "scala.tools.nsc", + "scala.tools.nsc.ast", + "scala.tools.nsc.ast.parser", + "scala.tools.nsc.ast.parser.xml", + "scala.tools.nsc.backend", + "scala.tools.nsc.backend.jvm", + "scala.tools.nsc.backend.jvm.analysis", + "scala.tools.nsc.backend.jvm.opt", + "scala.tools.nsc.classpath", + "scala.tools.nsc.doc", + "scala.tools.nsc.doc.base", + "scala.tools.nsc.doc.base.comment", + "scala.tools.nsc.doc.doclet", + "scala.tools.nsc.doc.html", + "scala.tools.nsc.doc.html.page", + "scala.tools.nsc.doc.html.page.diagram", + "scala.tools.nsc.doc.model", + "scala.tools.nsc.doc.model.diagram", + "scala.tools.nsc.interactive", + "scala.tools.nsc.interactive.tests", + "scala.tools.nsc.interactive.tests.core", + "scala.tools.nsc.interpreter", + "scala.tools.nsc.interpreter.jline", + "scala.tools.nsc.interpreter.jline_embedded", + "scala.tools.nsc.interpreter.session", + "scala.tools.nsc.io", + "scala.tools.nsc.javac", + "scala.tools.nsc.plugins", + "scala.tools.nsc.profile", + "scala.tools.nsc.reporters", + "scala.tools.nsc.settings", + "scala.tools.nsc.symtab", + "scala.tools.nsc.symtab.classfile", + "scala.tools.nsc.transform", + "scala.tools.nsc.transform.async", + "scala.tools.nsc.transform.patmat", + "scala.tools.nsc.typechecker", + "scala.tools.nsc.util", + "scala.tools.reflect", + "scala.tools.util" + ], + "org.scala-lang:scala-library": [ + "scala", + "scala.annotation", + "scala.annotation.meta", + "scala.annotation.unchecked", + "scala.beans", + "scala.collection", + "scala.collection.concurrent", + "scala.collection.convert", + "scala.collection.generic", + "scala.collection.immutable", + "scala.collection.mutable", + "scala.collection.parallel", + "scala.collection.parallel.immutable", + "scala.collection.parallel.mutable", + "scala.collection.script", + "scala.compat", + "scala.concurrent", + "scala.concurrent.duration", + "scala.concurrent.forkjoin", + "scala.concurrent.impl", + "scala.io", + "scala.math", + "scala.ref", + "scala.reflect", + "scala.reflect.macros.internal", + "scala.runtime", + "scala.runtime.java8", + "scala.sys", + "scala.sys.process", + "scala.text", + "scala.util", + "scala.util.control", + "scala.util.hashing", + "scala.util.matching" + ], + "org.scala-lang:scala-reflect": [ + "scala.reflect.api", + "scala.reflect.internal", + "scala.reflect.internal.annotations", + "scala.reflect.internal.pickling", + "scala.reflect.internal.settings", + "scala.reflect.internal.tpe", + "scala.reflect.internal.transform", + "scala.reflect.internal.util", + "scala.reflect.io", + "scala.reflect.macros", + "scala.reflect.macros.blackbox", + "scala.reflect.macros.whitebox", + "scala.reflect.runtime" + ], + "org.springframework:spring-beans": [ + "org.springframework.beans", + "org.springframework.beans.factory", + "org.springframework.beans.factory.annotation", + "org.springframework.beans.factory.aot", + "org.springframework.beans.factory.config", + "org.springframework.beans.factory.groovy", + "org.springframework.beans.factory.parsing", + "org.springframework.beans.factory.serviceloader", + "org.springframework.beans.factory.support", + "org.springframework.beans.factory.wiring", + "org.springframework.beans.factory.xml", + "org.springframework.beans.propertyeditors", + "org.springframework.beans.support" + ], + "org.springframework:spring-core": [ + "org.springframework.aot", + "org.springframework.aot.generate", + "org.springframework.aot.hint", + "org.springframework.aot.hint.annotation", + "org.springframework.aot.hint.predicate", + "org.springframework.aot.hint.support", + "org.springframework.aot.nativex", + "org.springframework.aot.nativex.feature", + "org.springframework.aot.nativex.substitution", + "org.springframework.asm", + "org.springframework.cglib", + "org.springframework.cglib.beans", + "org.springframework.cglib.core", + "org.springframework.cglib.core.internal", + "org.springframework.cglib.proxy", + "org.springframework.cglib.reflect", + "org.springframework.cglib.transform", + "org.springframework.cglib.transform.impl", + "org.springframework.cglib.util", + "org.springframework.core", + "org.springframework.core.annotation", + "org.springframework.core.codec", + "org.springframework.core.convert", + "org.springframework.core.convert.converter", + "org.springframework.core.convert.support", + "org.springframework.core.env", + "org.springframework.core.io", + "org.springframework.core.io.buffer", + "org.springframework.core.io.support", + "org.springframework.core.log", + "org.springframework.core.metrics", + "org.springframework.core.metrics.jfr", + "org.springframework.core.serializer", + "org.springframework.core.serializer.support", + "org.springframework.core.style", + "org.springframework.core.task", + "org.springframework.core.task.support", + "org.springframework.core.type", + "org.springframework.core.type.classreading", + "org.springframework.core.type.filter", + "org.springframework.javapoet", + "org.springframework.lang", + "org.springframework.objenesis", + "org.springframework.objenesis.instantiator", + "org.springframework.objenesis.instantiator.android", + "org.springframework.objenesis.instantiator.annotations", + "org.springframework.objenesis.instantiator.basic", + "org.springframework.objenesis.instantiator.gcj", + "org.springframework.objenesis.instantiator.perc", + "org.springframework.objenesis.instantiator.sun", + "org.springframework.objenesis.instantiator.util", + "org.springframework.objenesis.strategy", + "org.springframework.util", + "org.springframework.util.backoff", + "org.springframework.util.comparator", + "org.springframework.util.concurrent", + "org.springframework.util.function", + "org.springframework.util.unit", + "org.springframework.util.xml" + ], + "org.springframework:spring-jcl": [ + "org.apache.commons.logging", + "org.apache.commons.logging.impl" + ], + "org.springframework:spring-tx": [ + "org.springframework.dao", + "org.springframework.dao.annotation", + "org.springframework.dao.support", + "org.springframework.jca.endpoint", + "org.springframework.jca.support", + "org.springframework.transaction", + "org.springframework.transaction.annotation", + "org.springframework.transaction.config", + "org.springframework.transaction.event", + "org.springframework.transaction.interceptor", + "org.springframework.transaction.jta", + "org.springframework.transaction.reactive", + "org.springframework.transaction.support" + ], + "org.typelevel:cats-core_2.12": [ + "cats", + "cats.arrow", + "cats.compat", + "cats.conversions", + "cats.data", + "cats.evidence", + "cats.instances", + "cats.instances.symbol", + "cats.syntax" + ], + "org.typelevel:cats-kernel_2.12": [ + "cats.kernel", + "cats.kernel.compat", + "cats.kernel.instances", + "cats.kernel.instances.all", + "cats.kernel.instances.bigDecimal", + "cats.kernel.instances.bigInt", + "cats.kernel.instances.bitSet", + "cats.kernel.instances.boolean", + "cats.kernel.instances.byte", + "cats.kernel.instances.char", + "cats.kernel.instances.deadline", + "cats.kernel.instances.double", + "cats.kernel.instances.duration", + "cats.kernel.instances.either", + "cats.kernel.instances.finiteDuration", + "cats.kernel.instances.float", + "cats.kernel.instances.function", + "cats.kernel.instances.int", + "cats.kernel.instances.list", + "cats.kernel.instances.long", + "cats.kernel.instances.map", + "cats.kernel.instances.option", + "cats.kernel.instances.queue", + "cats.kernel.instances.seq", + "cats.kernel.instances.set", + "cats.kernel.instances.short", + "cats.kernel.instances.sortedMap", + "cats.kernel.instances.sortedSet", + "cats.kernel.instances.stream", + "cats.kernel.instances.string", + "cats.kernel.instances.symbol", + "cats.kernel.instances.tuple", + "cats.kernel.instances.unit", + "cats.kernel.instances.uuid", + "cats.kernel.instances.vector" + ], + "org.typelevel:kind-projector_2.12.20": [ + "d_m" + ] + }, + "repositories": { + "https://jcenter.bintray.com/": [ + "com.github.jnr:jffi", + "com.github.jnr:jffi:jar:sources", + "com.google.guava:guava", + "com.google.guava:guava:jar:sources", + "org.apache.commons:commons-lang3", + "org.apache.commons:commons-lang3:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-compiler:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources", + "org.springframework:spring-beans", + "org.springframework:spring-beans:jar:sources", + "org.springframework:spring-core", + "org.springframework:spring-core:jar:sources", + "org.springframework:spring-jcl", + "org.springframework:spring-jcl:jar:sources", + "org.springframework:spring-tx", + "org.springframework:spring-tx:jar:sources", + "org.typelevel:cats-core_2.12", + "org.typelevel:cats-core_2.12:jar:sources", + "org.typelevel:cats-kernel_2.12", + "org.typelevel:cats-kernel_2.12:jar:sources", + "org.typelevel:kind-projector_2.12.20", + "org.typelevel:kind-projector_2.12.20:jar:sources" + ], + "https://maven-central.storage-download.googleapis.com/maven2/": [ + "com.github.jnr:jffi", + "com.github.jnr:jffi:jar:sources", + "com.google.guava:guava", + "com.google.guava:guava:jar:sources", + "org.apache.commons:commons-lang3", + "org.apache.commons:commons-lang3:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-compiler:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources", + "org.springframework:spring-beans", + "org.springframework:spring-beans:jar:sources", + "org.springframework:spring-core", + "org.springframework:spring-core:jar:sources", + "org.springframework:spring-jcl", + "org.springframework:spring-jcl:jar:sources", + "org.springframework:spring-tx", + "org.springframework:spring-tx:jar:sources", + "org.typelevel:cats-core_2.12", + "org.typelevel:cats-core_2.12:jar:sources", + "org.typelevel:cats-kernel_2.12", + "org.typelevel:cats-kernel_2.12:jar:sources", + "org.typelevel:kind-projector_2.12.20", + "org.typelevel:kind-projector_2.12.20:jar:sources" + ], + "https://mirror.bazel.build/repo1.maven.org/maven2/": [ + "com.github.jnr:jffi", + "com.github.jnr:jffi:jar:sources", + "com.google.guava:guava", + "com.google.guava:guava:jar:sources", + "org.apache.commons:commons-lang3", + "org.apache.commons:commons-lang3:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-compiler:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources", + "org.springframework:spring-beans", + "org.springframework:spring-beans:jar:sources", + "org.springframework:spring-core", + "org.springframework:spring-core:jar:sources", + "org.springframework:spring-jcl", + "org.springframework:spring-jcl:jar:sources", + "org.springframework:spring-tx", + "org.springframework:spring-tx:jar:sources", + "org.typelevel:cats-core_2.12", + "org.typelevel:cats-core_2.12:jar:sources", + "org.typelevel:cats-kernel_2.12", + "org.typelevel:cats-kernel_2.12:jar:sources", + "org.typelevel:kind-projector_2.12.20", + "org.typelevel:kind-projector_2.12.20:jar:sources" + ], + "https://repo.maven.apache.org/maven2/": [ + "com.github.jnr:jffi", + "com.github.jnr:jffi:jar:sources", + "com.google.guava:guava", + "com.google.guava:guava:jar:sources", + "org.apache.commons:commons-lang3", + "org.apache.commons:commons-lang3:jar:sources", + "org.scala-lang.modules:scala-xml_2.12", + "org.scala-lang.modules:scala-xml_2.12:jar:sources", + "org.scala-lang:scala-compiler", + "org.scala-lang:scala-compiler:jar:sources", + "org.scala-lang:scala-library", + "org.scala-lang:scala-library:jar:sources", + "org.scala-lang:scala-reflect", + "org.scala-lang:scala-reflect:jar:sources", + "org.springframework:spring-beans", + "org.springframework:spring-beans:jar:sources", + "org.springframework:spring-core", + "org.springframework:spring-core:jar:sources", + "org.springframework:spring-jcl", + "org.springframework:spring-jcl:jar:sources", + "org.springframework:spring-tx", + "org.springframework:spring-tx:jar:sources", + "org.typelevel:cats-core_2.12", + "org.typelevel:cats-core_2.12:jar:sources", + "org.typelevel:cats-kernel_2.12", + "org.typelevel:cats-kernel_2.12:jar:sources", + "org.typelevel:kind-projector_2.12.20", + "org.typelevel:kind-projector_2.12.20:jar:sources" + ] + }, + "services": { + "org.scala-lang:scala-compiler": { + "javax.script.ScriptEngineFactory": [ + "scala.tools.nsc.interpreter.Scripted$Factory" + ] + }, + "org.springframework:spring-core": { + "reactor.blockhound.integration.BlockHoundIntegration": [ + "org.springframework.core.ReactiveAdapterRegistry$SpringCoreBlockHoundIntegration" + ] + }, + "org.springframework:spring-core:jar:sources": { + "reactor.blockhound.integration.BlockHoundIntegration": [ + "org.springframework.core.ReactiveAdapterRegistry$SpringCoreBlockHoundIntegration" + ] + }, + "org.springframework:spring-jcl": { + "org.apache.commons.logging.LogFactory": [ + "org.apache.commons.logging.LogFactoryService" + ] + }, + "org.springframework:spring-jcl:jar:sources": { + "org.apache.commons.logging.LogFactory": [ + "org.apache.commons.logging.LogFactoryService" + ] + } + }, + "version": "2" +} diff --git a/scala/private/extensions/BUILD b/scala/private/extensions/BUILD deleted file mode 100644 index e69de29bb..000000000 diff --git a/scala/private/extensions/dev_deps.bzl b/scala/private/extensions/dev_deps.bzl deleted file mode 100644 index a528888b3..000000000 --- a/scala/private/extensions/dev_deps.bzl +++ /dev/null @@ -1,116 +0,0 @@ -"""Repositories for testing rules_scala itself""" - -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("//scala:scala_cross_version.bzl", "default_maven_server_urls") -load("//scala:scala_maven_import_external.bzl", "java_import_external") -load( - "//scala/private:macros/bzlmod.bzl", - "root_module_tags", - "single_tag_values", -) -load("//third_party/repositories:repositories.bzl", "repositories") - -_BUILD_TOOLS_RELEASE = "8.2.1" -_BUILD_TOOLS_INTEGRITY = "sha256-UxGTl7vOHNfkxZDhF9zaNDwghhmd5ikyEGyAczUmwmE=" - -_settings_defaults = { - "maven_servers": default_maven_server_urls(), - "fetch_sources": False, -} - -_settings_attrs = { - "maven_servers": attr.string_list( - default = _settings_defaults["maven_servers"], - ), - "fetch_sources": attr.bool( - default = _settings_defaults["fetch_sources"], - ), -} - -_tag_classes = { - "settings": tag_class(attrs = _settings_attrs), -} - -def dev_deps_repositories( - name = "unused_dev_deps_name", - maven_servers = _settings_defaults["maven_servers"], - fetch_sources = _settings_defaults["fetch_sources"]): - """Instantiates internal only repos for development and testing - - Args: - name: unused macro parameter to satisfy Buildifier lint rules - maven_servers: servers to use when resolving Maven artifacts - fetch_sources: retrieve Maven artifact sources when True - """ - - # gazelle is still getting `buildtools` from its `go.mod` file, which breaks - # `bazel run //tools:lint_check` when we don't import it like this. See: - # - https://github.com/bazel-contrib/bazel-gazelle/blob/v0.43.0/MODULE.bazel#L32-L44 - http_archive( - name = "com_github_bazelbuild_buildtools", - integrity = _BUILD_TOOLS_INTEGRITY, - strip_prefix = "buildtools-%s" % _BUILD_TOOLS_RELEASE, - url = ( - "https://github.com/bazelbuild/buildtools/archive/v%s.tar.gz" % - _BUILD_TOOLS_RELEASE - ), - ) - - # bazel's java_import_external has been altered in rules_scala to be a macro - # based on jvm_import_external in order to allow for other jvm-language - # imports (e.g. scala_import) the 3rd-party dependency below is using the - # java_import_external macro in order to make sure no regression with the - # original java_import_external - java_import_external( - name = "org_apache_commons_commons_lang_3_5_without_file", - generated_linkable_rule_name = "linkable_org_apache_commons_commons_lang_3_5_without_file", - artifact_sha256 = "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", - jar_urls = ["https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"], - licenses = ["notice"], # Apache 2.0 - neverlink = True, - testonly_ = True, - ) - - repositories( - fetch_sources = fetch_sources, - fetch_sources_by_id = { - # Required by test/shell/test_scala_import_source_jar.sh. Without - # this, the first test will always fail, and the - # `BAZEL_JVM_FETCH_SOURCES` environment variable has no effect. - "com_google_guava_guava_21_0": True, - }, - for_artifact_ids = [ - # test adding a scala jar: - "com_twitter__scalding_date", - # test of strict deps (scalac plugin UT + E2E) - "com_google_guava_guava_21_0_with_file", - "com_github_jnr_jffi_native", - "org_apache_commons_commons_lang_3_5", - "com_google_guava_guava_21_0", - # test of import external - # scala maven import external decodes maven artifacts to its parts - # (group id, artifact id, packaging, version and classifier). To make sure - # the decoding and then the download url composition are working the artifact example - # must contain all the different parts and sha256s so the downloaded content will be - # validated against it - "org_springframework_spring_core", - "org_springframework_spring_tx", - "org_typelevel_kind_projector", - # For testing that we don't include sources jars to the classpath - "org_typelevel__cats_core", - ], - maven_servers = maven_servers, - ) - -def _dev_deps_impl(module_ctx): - """Instantiate internal only repos for development and testing""" - tags = root_module_tags(module_ctx, _tag_classes.keys()) - settings = single_tag_values(module_ctx, tags.settings, _settings_defaults) - dev_deps_repositories(**settings) - return module_ctx.extension_metadata(reproducible = True) - -dev_deps = module_extension( - implementation = _dev_deps_impl, - tag_classes = _tag_classes, - doc = "Configures repositories used only for internal testing", -) diff --git a/scala/private/macros/bzlmod.bzl b/scala/private/macros/bzlmod.bzl index 39a0f5442..607523824 100644 --- a/scala/private/macros/bzlmod.bzl +++ b/scala/private/macros/bzlmod.bzl @@ -5,7 +5,6 @@ class dictionaries, as employed by: - `//scala/extensions:config.bzl` - `//scala/extensions:deps.bzl` -- `//scala/private/extensions:dev_deps.bzl` - `//scala/private:macros/test/bzlmod_test_ext.bzl` This pattern overcomes the restriction that tag class attrs are not iterable, diff --git a/test/BUILD b/test/BUILD index bf313505b..1d2b712fd 100644 --- a/test/BUILD +++ b/test/BUILD @@ -296,7 +296,7 @@ scala_repl( scala_library( name = "jar_export", - exports = ["@org_typelevel__cats_core//jar"], + exports = ["@rules_scala_test_maven//:org_typelevel_cats_core_2_12"], ) #Mix java scala diff --git a/test/aspect/BUILD b/test/aspect/BUILD index 0da0e37e8..8cd95c7fc 100644 --- a/test/aspect/BUILD +++ b/test/aspect/BUILD @@ -48,7 +48,7 @@ scala_specs2_junit_test( scala_import( name = "com_google_guava_guava_21_0", - jars = ["@com_google_guava_guava_21_0_with_file//:guava-21.0.jar"], + jars = ["@rules_scala_test_maven//:com_google_guava_guava"], ) scala_library( diff --git a/test/shell/test_scala_import_source_jar.sh b/test/shell/test_scala_import_source_jar.sh deleted file mode 100755 index 9053f2be5..000000000 --- a/test/shell/test_scala_import_source_jar.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=./test_runner.sh -dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -. "${dir}"/test_runner.sh -. "${dir}"/test_helper.sh -runner=$(get_test_runner "${1:-local}") - -setup_suite() { - local target="@com_google_guava_guava_21_0//:guava-21.0-src.jar" - local result - - if ! result="$(target_file_location "$target")"; then - printf '%s' "$result" - return 1 - fi - bazel_out_external_guava_21="$result" -} - -test_scala_import_fetch_sources_with_env_bazel_jvm_fetch_sources_set_to() { - # the existence of the env var should cause the import repository rule to re-fetch the dependency - # and therefore the order of tests is not expected to matter - export BAZEL_JVM_FETCH_SOURCES="$1" - local expect_failure="${2:-}" - - test_scala_import_fetch_sources "$expect_failure" - unset BAZEL_JVM_FETCH_SOURCES -} - -# Tests using this helper depend upon setting `fetch_sources` for the repo to -# `True` in `scala/private/extensions/dev_deps.bzl`. Without that, the first -# test will always fail, and the `BAZEL_JVM_FETCH_SOURCES` environment variable -# has no effect. -test_scala_import_fetch_sources() { - local expect_failure="${1:-}" - - set -e - bazel build "//test/src/main/scala/scalarules/test/fetch_sources/..." - set +e - - assert_file_exists "$expect_failure" "$bazel_out_external_guava_21" -} - -assert_file_exists() { - if [[ -n "$1" ]]; then - if [[ -f "$2" ]]; then - echo "File $2 exists but we expect no source jars." - exit 1 - else - echo "File $2 does not exist." - fi - else - if [[ -f "$2" ]]; then - echo "File $2 exists." - else - echo "File $2 does not exist but we expect it to exist." - exit 1 - fi - fi -} - -test_scala_import_source_jar_should_be_fetched_when_fetch_sources_is_set_to_true() { - test_scala_import_fetch_sources -} - -test_scala_import_source_jar_should_be_fetched_when_env_bazel_jvm_fetch_sources_is_set_to_true() { - test_scala_import_fetch_sources_with_env_bazel_jvm_fetch_sources_set_to "TruE" # as implied, the value is case insensitive -} - -test_scala_import_source_jar_should_not_be_fetched_when_env_bazel_jvm_fetch_sources_is_set_to_non_true() { - test_scala_import_fetch_sources_with_env_bazel_jvm_fetch_sources_set_to "false" "true" -} - -setup_suite - -$runner test_scala_import_source_jar_should_be_fetched_when_fetch_sources_is_set_to_true -$runner test_scala_import_source_jar_should_be_fetched_when_env_bazel_jvm_fetch_sources_is_set_to_true -$runner test_scala_import_source_jar_should_not_be_fetched_when_env_bazel_jvm_fetch_sources_is_set_to_non_true diff --git a/test/shell/test_scala_library.sh b/test/shell/test_scala_library.sh index 82349d4b8..b91cc1928 100755 --- a/test/shell/test_scala_library.sh +++ b/test/shell/test_scala_library.sh @@ -61,19 +61,12 @@ test_scala_library_expect_failure_on_missing_direct_internal_deps() { } test_scala_library_expect_failure_on_missing_direct_external_deps_jar() { - dependenecy_target='@[a-z_.~+-]*com_google_guava_guava_21_0//:com_google_guava_guava_21_0' + dependenecy_target='@rules_scala_test_maven//:com_google_guava_guava' test_target='test_expect_failure/missing_direct_deps/external_deps:transitive_external_dependency_user' test_scala_library_expect_failure_on_missing_direct_deps $dependenecy_target $test_target } -test_scala_library_expect_failure_on_missing_direct_external_deps_file_group() { - dependenecy_target='@[a-z_.~+-]*com_google_guava_guava_21_0_with_file//:com_google_guava_guava_21_0_with_file' - test_target='test_expect_failure/missing_direct_deps/external_deps:transitive_external_dependency_user_file_group' - - test_scala_library_expect_failure_on_missing_direct_deps $dependenecy_target $test_target -} - test_scala_library_expect_failure_on_missing_direct_deps_strict_is_disabled_by_default() { expected_message="not found: value C" test_target='test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_user' @@ -103,7 +96,7 @@ test_scala_library_expect_failure_on_missing_direct_deps_off_mode() { #scalac outputs backslashes on windows (triple slash needed for the grep) if is_windows; then local expected_message="test_expect_failure\\\missing_direct_deps\\\internal_deps\\\A.scala:[0-9+]: error: not found: value C" - + else local expected_message="test_expect_failure/missing_direct_deps/internal_deps/A.scala:[0-9+]: error: not found: value C" fi @@ -190,7 +183,6 @@ test_scala_library_expect_better_failure_message_on_missing_transitive_dependenc $runner test_scala_library_suite $runner test_scala_library_expect_failure_on_missing_direct_internal_deps $runner test_scala_library_expect_failure_on_missing_direct_external_deps_jar -$runner test_scala_library_expect_failure_on_missing_direct_external_deps_file_group $runner test_scala_library_expect_failure_on_missing_direct_deps_strict_is_disabled_by_default $runner test_scala_library_expect_failure_on_missing_direct_deps_warn_mode $runner test_scala_library_expect_failure_on_missing_direct_deps_warn_mode_java diff --git a/test/shell/test_strict_dependency.sh b/test/shell/test_strict_dependency.sh index 82feb8ddf..99122ffab 100755 --- a/test/shell/test_strict_dependency.sh +++ b/test/shell/test_strict_dependency.sh @@ -60,7 +60,7 @@ test_strict_deps_filter_excluded_target() { test_strict_deps_filter_included_target() { local test_target="//test_expect_failure/missing_direct_deps/filtering:b" - local expected_message="buildozer 'add deps @[a-z_.~+-]*com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}" + local expected_message="buildozer 'add deps @rules_scala_test_maven//:com_google_guava_guava' ${test_target}" test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \ "${expected_message}" ${test_target} \ diff --git a/test/shell/test_unused_dependency.sh b/test/shell/test_unused_dependency.sh index 94a4ecdc6..6450b5c17 100755 --- a/test/shell/test_unused_dependency.sh +++ b/test/shell/test_unused_dependency.sh @@ -79,7 +79,7 @@ test_unused_deps_filter_excluded_target() { test_unused_deps_filter_included_target() { local test_target="//test_expect_failure/unused_dependency_checker/filtering:b" - local expected_message="buildozer 'remove deps @[a-z_.~+-]*com_google_guava_guava_21_0//:com_google_guava_guava_21_0' ${test_target}" + local expected_message="buildozer 'remove deps @rules_scala_test_maven//:com_google_guava_guava' ${test_target}" test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message \ "${expected_message}" ${test_target} \ diff --git a/test/src/main/scala/scalarules/test/compiler_plugin/BUILD.bazel b/test/src/main/scala/scalarules/test/compiler_plugin/BUILD.bazel index f7f84b2e8..0884602e7 100644 --- a/test/src/main/scala/scalarules/test/compiler_plugin/BUILD.bazel +++ b/test/src/main/scala/scalarules/test/compiler_plugin/BUILD.bazel @@ -4,6 +4,6 @@ scala_library( name = "compiler_plugin", testonly = True, srcs = ["KindProjected.scala"], - plugins = ["@org_typelevel_kind_projector//jar"], + plugins = ["@rules_scala_test_maven//:org_typelevel_kind_projector_2_12_20"], visibility = ["//visibility:public"], ) diff --git a/test/src/main/scala/scalarules/test/fetch_sources/BUILD b/test/src/main/scala/scalarules/test/fetch_sources/BUILD deleted file mode 100644 index 45c3a19e5..000000000 --- a/test/src/main/scala/scalarules/test/fetch_sources/BUILD +++ /dev/null @@ -1,8 +0,0 @@ -load("//scala:scala.bzl", "scala_library") - -scala_library( - name = "fetch_sources", - testonly = True, - srcs = ["FetchSources.scala"], - deps = ["@com_google_guava_guava_21_0//jar"], -) diff --git a/test/src/main/scala/scalarules/test/fetch_sources/FetchSources.scala b/test/src/main/scala/scalarules/test/fetch_sources/FetchSources.scala deleted file mode 100644 index 3f6a8712c..000000000 --- a/test/src/main/scala/scalarules/test/fetch_sources/FetchSources.scala +++ /dev/null @@ -1,6 +0,0 @@ -package scalarules.test.src.main.scala.scalarules.test.fetch_sources - -/* This file's only purpose is to materialize the dependency in guava and be built! */ -class FetchSources { - println(classOf[com.google.common.cache.Cache[_, _]]) -} diff --git a/test/src/main/scala/scalarules/test/scala_import/BUILD b/test/src/main/scala/scalarules/test/scala_import/BUILD index 966a7dc74..9c704f1ad 100644 --- a/test/src/main/scala/scalarules/test/scala_import/BUILD +++ b/test/src/main/scala/scalarules/test/scala_import/BUILD @@ -7,8 +7,8 @@ load(":scala_import_stamp_test.bzl", "scala_import_stamping_test_suite") scala_import( name = "guava_and_commons_lang", jars = [ - "@com_google_guava_guava_21_0_with_file//:guava-21.0.jar", - "@org_apache_commons_commons_lang_3_5//:commons-lang3-3.5.jar", + "@rules_scala_test_maven//:com_google_guava_guava", + "@rules_scala_test_maven//:org_apache_commons_commons_lang3", ], ) @@ -16,7 +16,7 @@ scala_import( name = "jffi_native_external", testonly = True, jars = [ - "@com_github_jnr_jffi_native//jar", + "@rules_scala_test_maven//:com_github_jnr_jffi", ], ) @@ -50,21 +50,12 @@ scala_specs2_junit_test( deps = [":imported_genericlib_jar"], ) -scala_library( - name = "source_jar_not_oncp", - testonly = True, - srcs = ["ReferCatsImplicits.scala"], - # jvm_maven_import_external doesn't fetch source jars automatically - deps = ["@org_typelevel__cats_core//jar"], -) - ##Runtime deps scala_import( name = "indirection_for_transitive_runtime_deps", testonly = True, jars = [], - # jvm_maven_import_external doesn't fetch source jars automatically - deps = ["@org_typelevel__cats_core//jar"], + deps = ["@rules_scala_test_maven//:org_typelevel_cats_core_2_12"], ) scala_import( @@ -88,8 +79,8 @@ scala_specs2_junit_test( java_import( name = "guava_and_commons_lang_java_import", jars = [ - "@com_google_guava_guava_21_0_with_file//:guava-21.0.jar", - "@org_apache_commons_commons_lang_3_5//:commons-lang3-3.5.jar", + "@rules_scala_test_maven//:com/google/guava/guava/21.0/guava-21.0.jar", + "@rules_scala_test_maven//:org/apache/commons/commons-lang3/3.18.0/commons-lang3-3.18.0.jar", ], ) diff --git a/test/src/main/scala/scalarules/test/sources_jars_in_deps/BUILD b/test/src/main/scala/scalarules/test/sources_jars_in_deps/BUILD deleted file mode 100644 index 1178d3ee0..000000000 --- a/test/src/main/scala/scalarules/test/sources_jars_in_deps/BUILD +++ /dev/null @@ -1,10 +0,0 @@ -load("//scala:scala.bzl", "scala_library") - -scala_library( - name = "source_jar_not_oncp", - testonly = True, - srcs = ["ReferCatsImplicits.scala"], - deps = [ - "@org_typelevel__cats_core//jar", - ], -) diff --git a/test/src/main/scala/scalarules/test/sources_jars_in_deps/ReferCatsImplicits.scala b/test/src/main/scala/scalarules/test/sources_jars_in_deps/ReferCatsImplicits.scala deleted file mode 100644 index 2febab6a0..000000000 --- a/test/src/main/scala/scalarules/test/sources_jars_in_deps/ReferCatsImplicits.scala +++ /dev/null @@ -1,6 +0,0 @@ -package scala_rules.bazel -import cats.implicits._ - - -object TestObj {} - diff --git a/test_expect_failure/missing_direct_deps/external_deps/BUILD b/test_expect_failure/missing_direct_deps/external_deps/BUILD index 85fda526c..dbf5bcf3d 100644 --- a/test_expect_failure/missing_direct_deps/external_deps/BUILD +++ b/test_expect_failure/missing_direct_deps/external_deps/BUILD @@ -18,25 +18,7 @@ scala_library( srcs = [ "B.scala", ], - deps = ["@com_google_guava_guava_21_0//jar"], -) - -scala_library( - name = "transitive_external_dependency_user_file_group", - testonly = True, - srcs = [ - "A.scala", - ], - deps = ["external_dependency_user_file_group"], -) - -scala_library( - name = "external_dependency_user_file_group", - testonly = True, - srcs = [ - "B.scala", - ], - deps = ["@com_google_guava_guava_21_0_with_file//jar"], + deps = ["@rules_scala_test_maven//:com_google_guava_guava"], ) # tests if external jars are stamped with a correct label diff --git a/test_expect_failure/missing_direct_deps/filtering/BUILD b/test_expect_failure/missing_direct_deps/filtering/BUILD index b2df4a718..986090676 100644 --- a/test_expect_failure/missing_direct_deps/filtering/BUILD +++ b/test_expect_failure/missing_direct_deps/filtering/BUILD @@ -24,7 +24,7 @@ scala_library( name = "transitive_deps", testonly = True, srcs = ["UsesGuava.scala"], - deps = ["@com_google_guava_guava_21_0"], + deps = ["@rules_scala_test_maven//:com_google_guava_guava"], ) scala_library( diff --git a/test_expect_failure/plus_one_deps/external_deps/BUILD.bazel b/test_expect_failure/plus_one_deps/external_deps/BUILD.bazel index 47dbf7537..6c14e977a 100644 --- a/test_expect_failure/plus_one_deps/external_deps/BUILD.bazel +++ b/test_expect_failure/plus_one_deps/external_deps/BUILD.bazel @@ -4,5 +4,5 @@ scala_library( name = "a", testonly = True, srcs = ["A.scala"], - deps = ["@org_springframework_spring_tx"], + deps = ["@rules_scala_test_maven//:org_springframework_spring_tx"], ) diff --git a/test_expect_failure/scala_import/BUILD b/test_expect_failure/scala_import/BUILD index 0db9e4405..733c22046 100644 --- a/test_expect_failure/scala_import/BUILD +++ b/test_expect_failure/scala_import/BUILD @@ -7,20 +7,20 @@ load("//scala:scala_import.bzl", "scala_import") scala_import( name = "dummy_dependency_to_trigger_create_provider_transitive_compile_jar_usage", testonly = True, - jars = ["@org_springframework_spring_core//jar"], + jars = ["@rules_scala_test_maven//:org_springframework_spring_core"], ) scala_import( name = "guava", testonly = True, - jars = ["@com_google_guava_guava_21_0_with_file//jar"], + jars = ["@rules_scala_test_maven//:com_google_guava_guava"], deps = [":dummy_dependency_to_trigger_create_provider_transitive_compile_jar_usage"], ) scala_import( name = "cats", testonly = True, - jars = ["@org_typelevel__cats_core//jar"], + jars = ["@rules_scala_test_maven//:org_typelevel_cats_core_2_12"], ) scala_import( @@ -33,7 +33,7 @@ scala_import( scala_import( name = "commons_lang_as_imported_jar_cats_and_guava_as_compile_deps", testonly = True, - jars = ["@org_apache_commons_commons_lang_3_5//jar"], + jars = ["@rules_scala_test_maven//:org_apache_commons_commons_lang3"], deps = [ ":guava", ":indirection_for_transitive_compile_deps", diff --git a/test_expect_failure/unused_dependency_checker/filtering/BUILD b/test_expect_failure/unused_dependency_checker/filtering/BUILD index 4199f656a..398fb68bf 100644 --- a/test_expect_failure/unused_dependency_checker/filtering/BUILD +++ b/test_expect_failure/unused_dependency_checker/filtering/BUILD @@ -24,12 +24,12 @@ scala_library( name = "a", testonly = True, srcs = ["Empty.scala"], - deps = ["@com_google_guava_guava_21_0"], + deps = ["@rules_scala_test_maven//:com_google_guava_guava"], ) scala_library( name = "b", testonly = True, srcs = ["Empty.scala"], - deps = ["@com_google_guava_guava_21_0"], + deps = ["@rules_scala_test_maven//:com_google_guava_guava"], ) diff --git a/test_rules_scala.sh b/test_rules_scala.sh index 5674085c4..7706e5e6e 100755 --- a/test_rules_scala.sh +++ b/test_rules_scala.sh @@ -45,7 +45,6 @@ $runner bazel build //test_statsfile:SimpleNoStatsFile_statsfile --extra_toolcha . "${test_dir}"/test_scalac_jvm_flags.sh . "${test_dir}"/test_scala_classpath.sh . "${test_dir}"/test_scala_config.sh -. "${test_dir}"/test_scala_import_source_jar.sh . "${test_dir}"/test_scala_jvm_flags.sh . "${test_dir}"/test_scala_jacocorunner.sh . "${test_dir}"/test_scala_library_jar.sh diff --git a/third_party/dependency_analyzer/src/test/analyzer_test.bzl b/third_party/dependency_analyzer/src/test/analyzer_test.bzl index d836a3e58..910978cb7 100644 --- a/third_party/dependency_analyzer/src/test/analyzer_test.bzl +++ b/third_party/dependency_analyzer/src/test/analyzer_test.bzl @@ -60,16 +60,16 @@ def tests(): "io/bazel/rulesscala/dependencyanalyzer/StrictDepsTest.scala", ], jvm_flags = common_jvm_flags + [ - "-Dguava.jar.location=$(rootpath @com_google_guava_guava_21_0_with_file//jar)", - "-Dapache.commons.jar.location=$(rootpath @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)", + "-Dguava.jar.location=$(rootpath @rules_scala_test_maven//:com_google_guava_guava)", + "-Dapache.commons.jar.location=$(rootpath @rules_scala_test_maven//:org_apache_commons_commons_lang3)", ], unused_dependency_checker_mode = "off", deps = scala_std_dependencies + [ "//third_party/dependency_analyzer/src/main:dependency_analyzer", "//third_party/utils/src/test:test_util", - "@com_google_guava_guava_21_0_with_file//jar", "@io_bazel_rules_scala_scala_compiler" + suffix, - "@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file", + "@rules_scala_test_maven//:com_google_guava_guava", + "@rules_scala_test_maven//:org_apache_commons_commons_lang3", ], ) @@ -80,14 +80,14 @@ def tests(): "io/bazel/rulesscala/dependencyanalyzer/UnusedDependencyCheckerTest.scala", ], jvm_flags = common_jvm_flags + [ - "-Dapache.commons.jar.location=$(rootpath @org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file)", + "-Dapache.commons.jar.location=$(rootpath @rules_scala_test_maven//:org_apache_commons_commons_lang3)", ], unused_dependency_checker_mode = "off", deps = scala_std_dependencies + [ "//third_party/dependency_analyzer/src/main:dependency_analyzer", "//third_party/utils/src/test:test_util", "@io_bazel_rules_scala_scala_compiler" + suffix, - "@org_apache_commons_commons_lang_3_5_without_file//:linkable_org_apache_commons_commons_lang_3_5_without_file", + "@rules_scala_test_maven//:org_apache_commons_commons_lang3", ], ) diff --git a/tools/BUILD b/tools/BUILD index 2225c28b9..ce9916886 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -1,8 +1,4 @@ -load( - "@com_github_bazelbuild_buildtools//buildifier:def.bzl", - "buildifier", - "buildifier_test", -) +load("@buildifier_prebuilt//:rules.bzl", "buildifier", "buildifier_test") WARNINGS_CONFIG = [ "-module-docstring",