Skip to content

Commit

Permalink
Merge pull request #5 from michalbogacz/update-scala-2-13-15
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
michalbogacz authored Oct 6, 2024
2 parents 92b0bc5 + ff469d0 commit 4c005c4
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 28 deletions.
18 changes: 4 additions & 14 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
build --java_language_version=17
build --java_runtime_version=17
build --tool_java_runtime_version=17
build --tool_java_language_version=17

test --java_language_version=17
test --java_runtime_version=17
test --tool_java_runtime_version=17
test --tool_java_language_version=17

run --java_language_version=17
run --java_runtime_version=17
run --tool_java_runtime_version=17
run --tool_java_language_version=17
common --java_language_version=17
common --java_runtime_version=17
common --tool_java_runtime_version=17
common --tool_java_language_version=17
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.3.1
7.3.2
6 changes: 0 additions & 6 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
###############################################################################
# Bazel now uses Bzlmod by default to manage external dependencies.
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
#
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
###############################################################################
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.4")

Expand Down
22 changes: 15 additions & 7 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,42 @@ http_archive(
)

load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
scala_config(scala_version = "2.13.14")

scala_config(scala_version = "2.13.15")

load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")

# This is required to update Scala version with rules_scala 6.6
scala_repositories(
overriden_artifacts = {
# Change both the artifact names and sha256s.
"io_bazel_rules_scala_scala_library": {
"artifact": "org.scala-lang:scala-library:{}".format("2.13.14"),
"sha256": "43e0ca1583df1966eaf02f0fbddcfb3784b995dd06bfc907209347758ce4b7e3",
"artifact": "org.scala-lang:scala-library:{}".format("2.13.15"),
"sha256": "8e4dbc3becf70d59c787118f6ad06fab6790136a0699cd6412bc9da3d336944e",
},
"io_bazel_rules_scala_scala_compiler": {
"artifact": "org.scala-lang:scala-compiler:{}".format("2.13.14"),
"sha256": "17b7e1dd95900420816a3bc2788c8c7358c2a3c42899765a5c463a46bfa569a6",
"artifact": "org.scala-lang:scala-compiler:{}".format("2.13.15"),
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
},
"io_bazel_rules_scala_scala_reflect": {
"artifact": "org.scala-lang:scala-reflect:{}".format("2.13.14"),
"sha256": "8846baaa8cf43b1b19725ab737abff145ca58d14a4d02e75d71ca8f7ca5f2926",
"artifact": "org.scala-lang:scala-reflect:{}".format("2.13.15"),
"sha256": "78d0cc350e1ee42d87c6e11cf5b0dc7bf0b70829c00aa38f27bfb019d439dc11",
},
},
)

load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")

rules_proto_dependencies()

rules_proto_toolchains()

load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")

scala_register_toolchains()

load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")

scalatest_repositories()

scalatest_toolchain()

0 comments on commit 4c005c4

Please sign in to comment.