Upgrade scala 2.13.x version (#2) (#2)

confluentinc · Aug 13, 2024 · 8f7fc6d · 8f7fc6d
1 parent 538d7bc
commit 8f7fc6d
Show file tree

Hide file tree

Showing 13 changed files with 202 additions and 197 deletions.
diff --git a/README.md b/README.md
@@ -143,13 +143,13 @@ Previous minor versions may work but are supported only on a best effort basis.
 To configure Scala version you must call `scala_config(scala_version = "2.xx.xx")` and configure 
 dependencies by declaring [scala_toolchain](docs/scala_toolchain.md). 
 For a quick start you can use `scala_repositories()` and `scala_register_toolchains()`, which have 
-dependency providers configured for `2.11.12`, `2.12.18` and `2.13.12` versions.
+dependency providers configured for `2.11.12`, `2.12.18` and `2.13.14` versions.
 
 
 ```starlark
 # WORKSPACE
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
-scala_config(scala_version = "2.13.12")
+scala_config(scala_version = "2.13.14")
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
 rules_proto_dependencies()

diff --git a/dt_patches/dt_patch_test.sh b/dt_patches/dt_patch_test.sh
@@ -114,6 +114,7 @@ run_test_local test_compiler_patch 2.13.8
 run_test_local test_compiler_patch 2.13.10
 run_test_local test_compiler_patch 2.13.11
 run_test_local test_compiler_patch 2.13.12
+run_test_local test_compiler_patch 2.13.14
 
 run_test_local test_compiler_srcjar_error 2.12.11
 run_test_local test_compiler_srcjar_error 2.12.12
@@ -128,4 +129,5 @@ run_test_local test_compiler_srcjar_nonhermetic 2.12.17
 run_test_local test_compiler_srcjar_nonhermetic 2.12.18
 
 run_test_local test_compiler_srcjar_nonhermetic 2.13.11
-run_test_local test_compiler_srcjar_nonhermetic 2.13.12
+run_test_local test_compiler_srcjar_nonhermetic 2.13.12
+run_test_local test_compiler_srcjar_nonhermetic 2.13.14
diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE
@@ -97,6 +97,9 @@ srcjars_by_version = {
     "2.13.12": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.12/scala-compiler-2.13.12-sources.jar?foo",
     },
+    "2.13.14": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.14/scala-compiler-2.13.14-sources.jar?foo",
+    },
 }
 
 rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION])

diff --git a/examples/crossbuild/1_single/BUILD b/examples/crossbuild/1_single/BUILD
@@ -14,7 +14,7 @@ scala_library(
 scala_test(
     name = "test213",
     srcs = ["test.scala"],
-    scala_version = "2.13.12",
+    scala_version = "2.13.14",
 )
 
 # This one will be compiled by 3.3 compiler (the default one):

diff --git a/examples/crossbuild/2_deps/BUILD b/examples/crossbuild/2_deps/BUILD
@@ -19,7 +19,7 @@ scala_binary(
     name = "bin213",
     srcs = ["bin.scala"],  # compiled with 2.13 (as per `scala_version`)
     main_class = "C",
-    scala_version = "2.13.12",
+    scala_version = "2.13.14",
     deps = [
         ":lib",  # compiled 2.13 (as per `scala_version`)
         ":lib211",  # compiled with 2.11 (that target overrides version)

diff --git a/examples/crossbuild/3_select/BUILD b/examples/crossbuild/3_select/BUILD
@@ -22,7 +22,7 @@ scala_binary(
     name = "bin2",
     srcs = ["bin.scala"],
     main_class = "B",
-    scala_version = "2.13.12",
+    scala_version = "2.13.14",
     deps = [":lib"],
 )
 

diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE
@@ -22,7 +22,7 @@ scala_config(
     scala_version = "3.3.1",
     scala_versions = [
         "2.11.12",
-        "2.13.12",
+        "2.13.14",
         "3.3.1",
     ],
 )

diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE
@@ -21,7 +21,7 @@ local_repository(
 
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
 
-scala_config(scala_version = "2.13.12")
+scala_config(scala_version = "2.13.14")
 
 load(
     "@io_bazel_rules_scala//scala:scala.bzl",

diff --git a/test/shell/test_scala_config.sh b/test/shell/test_scala_config.sh
@@ -12,7 +12,7 @@ test_classpath_contains_2_12() {
 
 test_classpath_contains_2_13() {
   bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \
-   --repo_env=SCALA_VERSION=2.13.12 \
+   --repo_env=SCALA_VERSION=2.13.14 \
    | grep scala-library-2.13
 }
 

diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE
@@ -39,7 +39,7 @@ scala_config(
     scala_versions = [
         "2.11.12",
         "2.12.18",
-        "2.13.12",
+        "2.13.14",
         "3.1.0",
         "3.2.1",
         "3.3.1",

diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD
@@ -20,15 +20,15 @@ scalafmt_scala_library(
     srcs = ["unformatted/unformatted-library2.scala"],
     config = ":scala2-conf",
     format = True,
-    scala_version = "2.13.12",
+    scala_version = "2.13.14",
 )
 
 scalafmt_scala_library(
     name = "formatted-library2",
     srcs = ["formatted/formatted-library2.scala"],
     config = ":scala2-conf",
     format = True,
-    scala_version = "2.13.12",
+    scala_version = "2.13.14",
 )
 
 scalafmt_scala_library(

diff --git a/test_version.sh b/test_version.sh
@@ -4,7 +4,7 @@ set -e
 
 scala_2_11_version="2.11.12"
 scala_2_12_version="2.12.18"
-scala_2_13_version="2.13.12"
+scala_2_13_version="2.13.14"
 
 SCALA_VERSION_DEFAULT=$scala_2_11_version