Merge branch 'master' into fix-deps

# Conflicts: # deps/scala_deps.bzl
timothyklim · Nov 4, 2024 · 05c422d · 05c422d
2 parents ab98706 + afadd88
commit 05c422d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/BUILD b/BUILD
@@ -30,6 +30,6 @@ configure_zinc_scala(
     compiler_bridge = "@scala3_sbt_bridge//jar",
     compiler_classpath = compiler_classpath_3,
     runtime_classpath = runtime_classpath_3,
-    version = "3.5.1-RC1",
+    version = "3.6.1",
     visibility = ["//visibility:public"],
 )
diff --git a/deps/scala_deps.bzl b/deps/scala_deps.bzl
@@ -5,7 +5,7 @@ def scala_deps(
         dependencies,
         src,
         project_root = ".",
-        scala_version = "3.5.2",
+        scala_version = "3.6.1",
         targets_dir_name = "jvm",
         targets_file_name = "BUILD"):
     destination = native.package_name() + "/3rdparty"

diff --git a/rules/scala/workspace.bzl b/rules/scala/workspace.bzl
@@ -58,7 +58,7 @@ def scala_repositories():
     )
 
     scala2 = "2.13.15"
-    scala3 = "3.5.2"
+    scala3 = "3.6.1"
     scalajs = "1.17.0"
 
     direct_deps = [

diff --git a/scala/BUILD b/scala/BUILD
@@ -80,7 +80,7 @@ alias(
     visibility = ["//visibility:public"],
 )
 
-scala3 = "3.5.1-RC1"
+scala3 = "3.6.1"
 
 scala3_global_scalacopts = [
     "-deprecation",

diff --git a/scala3/repositories.bzl b/scala3/repositories.bzl
@@ -103,7 +103,7 @@ def _scala3_toolchain_repository_impl(repository_ctx):
     # TODO load maven deps, like `rules_scala_toolchain_deps_repositories` does.
     # `repository_ctx.attr.scala_version` should be used to resolve deps and
     # determine the full version
-    scala_version = "3.5.1-RC1"
+    scala_version = "3.6.1"
     compiler_bridge = repository_ctx.attr.compiler_bridge or "@scala3_sbt_bridge//jar"
 
     compiler_classpath = repository_ctx.attr.compiler_classpath or [