Skip to content

Commit eba5bfa

Browse files
authored
Upgrade rules scala (#1954)
* Upgrade scala version. * Fixing escapes.
1 parent a351a3f commit eba5bfa

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

WORKSPACE

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,15 +297,25 @@ jvm_maven_import_external(
297297
# For our scala_image test.
298298
http_archive(
299299
name = "io_bazel_rules_scala",
300-
sha256 = "ed1a62f9fb2cb8930dd026b761ff900599b4c786c6cb6b7b5f9ad418f312c272",
301-
strip_prefix = "rules_scala-0366fb23cb91fee2847a8358472278ddc9940c5f",
302-
urls = ["https://github.com/bazelbuild/rules_scala/archive/0366fb23cb91fee2847a8358472278ddc9940c5f.tar.gz"],
300+
sha256 = "ccf19e8f966022eaaca64da559c6140b23409829cb315f2eff5dc3e757fb6ad8",
301+
strip_prefix = "rules_scala-e4560ac332e9da731c1e50a76af2579c55836a5c",
302+
urls = ["https://github.com/bazelbuild/rules_scala/archive/e4560ac332e9da731c1e50a76af2579c55836a5c.zip"],
303303
)
304304

305+
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
306+
307+
scala_config()
308+
305309
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
306310

307311
scala_repositories()
308312

313+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
314+
315+
rules_proto_dependencies()
316+
317+
rules_proto_toolchains()
318+
309319
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
310320

311321
scala_register_toolchains()

tests/container/scala/configs/scala_image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadataTest:
44
entrypoint: [
55
'/usr/bin/java',
66
'-cp',
7-
'/app/io_bazel_rules_docker/tests/container/scala/scala_image_library.jar:/app/io_bazel_rules_docker/../com_google_guava_guava/guava-18.0.jar:/app/io_bazel_rules_docker/../io_bazel_rules_scala_scala_library/scala-library-2.11.12.jar:/app/io_bazel_rules_docker/../io_bazel_rules_scala_scala_reflect/scala-reflect-2.11.12.jar:/app/io_bazel_rules_docker/tests/container/scala/scala_image.binary.jar:/app/io_bazel_rules_docker/tests/container/scala/BUILD:/app/io_bazel_rules_docker/tests/container/scala/scala_image.binary_wrapper.sh:/app/io_bazel_rules_docker/tests/container/scala/scala_image.binary',
7+
'/app/io_bazel_rules_docker/tests/container/scala/scala_image_library.jar:/app/io_bazel_rules_docker/../com_google_guava_guava/guava-18.0.jar:/app/io_bazel_rules_docker/../io_bazel_rules_scala_scala_library/scala-library-2.12.14.jar:/app/io_bazel_rules_docker/../io_bazel_rules_scala_scala_reflect/scala-reflect-2.12.14.jar:/app/io_bazel_rules_docker/tests/container/scala/scala_image.binary.jar:/app/io_bazel_rules_docker/tests/container/scala/scala_image.binary:/app/io_bazel_rules_docker/tests/container/scala/BUILD:/app/io_bazel_rules_docker/tests/container/scala/scala_image.binary_wrapper.sh',
88
'-Dbuild.location=tests/container/scala/BUILD',
99
'examples.images.Binary',
1010
'arg0',

0 commit comments

Comments
 (0)