Upgrade Scala 3 LTS to 3.3.5 (#1689)

bazelbuild · Feb 3, 2025 · f30237b · f30237b
1 parent 870d952
commit f30237b
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 29 deletions.
diff --git a/dt_patches/dt_patch_test.sh b/dt_patches/dt_patch_test.sh
@@ -119,7 +119,7 @@ run_test_local test_compiler_patch 2.13.15
 run_test_local test_compiler_patch 3.1.0 # Minimal supported version
 run_test_local test_compiler_patch 3.1.3
 run_test_local test_compiler_patch 3.2.2
-run_test_local test_compiler_patch 3.3.4 
+run_test_local test_compiler_patch 3.3.5
 run_test_local test_compiler_patch 3.4.3
 run_test_local test_compiler_patch 3.5.2
 run_test_local test_compiler_patch 3.6.2
@@ -151,7 +151,7 @@ run_test_local test_compiler_srcjar_nonhermetic 2.13.15
 
 run_test_local test_compiler_srcjar 3.1.3
 run_test_local test_compiler_srcjar 3.2.2
-run_test_local test_compiler_srcjar_nonhermetic 3.3.4
+run_test_local test_compiler_srcjar_nonhermetic 3.3.5
 run_test_local test_compiler_srcjar 3.4.3
 run_test_local test_compiler_srcjar_nonhermetic 3.5.2
 run_test_local test_compiler_srcjar_nonhermetic 3.6.2
diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE
@@ -120,8 +120,8 @@ srcjars_by_version = {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.2.2/scala3-compiler_3-3.2.2-sources.jar",
         "sha256": "669d580fc4a8d3c2e2d13d5735ae9be05d567613fe44482de5bcc5e2e2ee89ea",
     },
-    "3.3.4": {
-        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.4/scala3-compiler_3-3.3.4-sources.jar",
+    "3.3.5": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.5/scala3-compiler_3-3.3.5-sources.jar",
     },
     "3.4.3": {
         "label": "@scala3_compiler_srcjar//jar:downloaded.jar",

diff --git a/examples/crossbuild/3_select/BUILD b/examples/crossbuild/3_select/BUILD
@@ -30,6 +30,6 @@ scala_binary(
     name = "bin3",
     srcs = ["bin.scala"],
     main_class = "B",
-    scala_version = "3.3.4",
+    scala_version = "3.3.5",
     deps = [":lib"],
 )
diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE
@@ -51,11 +51,11 @@ rules_proto_toolchains()
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
 
 scala_config(
-    scala_version = "3.3.4",
+    scala_version = "3.3.5",
     scala_versions = [
         "2.11.12",
         "2.13.15",
-        "3.3.4",
+        "3.3.5",
     ],
 )
 

diff --git a/scripts/create_repository.py b/scripts/create_repository.py
@@ -20,7 +20,7 @@
     "2.13.15",
     "3.1.3",
     "3.2.2",
-    "3.3.4",
+    "3.3.5",
     "3.4.3",
     "3.5.2",
     "3.6.3"

diff --git a/test/shell/test_examples.sh b/test/shell/test_examples.sh
@@ -38,7 +38,7 @@ function scala3_2_example() {
 }
 
 function scala3_3_example() {
-  test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.4 //..."
+  test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.5 //..."
 }
 
 function scala3_4_example() {

diff --git a/test/shell/test_invalid_scalacopts.sh b/test/shell/test_invalid_scalacopts.sh
@@ -25,7 +25,7 @@ test_logs_not_contains() {
    2>&1 | grep -v "$expected"
 }
 
-for scalaVersion in 2.12.20 2.13.15 3.3.4; do
+for scalaVersion in 2.12.20 2.13.15 3.3.5; do
   if [[ "$scalaVersion" == 3.* ]]; then
     $runner test_logs_contains $scalaVersion "not-existing is not a valid choice for -source"
   else

diff --git a/test/shell/test_semanticdb.sh b/test/shell/test_semanticdb.sh
@@ -30,7 +30,7 @@ test_produces_semanticdb(){
   fi
 
   if [ $scala_majver -eq 3 ]; then
-    local version_opt="--repo_env=SCALA_VERSION=3.3.4"
+    local version_opt="--repo_env=SCALA_VERSION=3.3.5"
   fi
 
 

diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE
@@ -58,7 +58,7 @@ scala_config(
         "2.13.15",
         "3.1.3",
         "3.2.2",
-        "3.3.4",
+        "3.3.5",
     ],
 )
 

diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD
@@ -36,15 +36,15 @@ scalafmt_scala_library(
     srcs = ["unformatted/unformatted-library3.scala"],
     config = ":scala3-conf",
     format = True,
-    scala_version = "3.3.4",
+    scala_version = "3.3.5",
 )
 
 scalafmt_scala_library(
     name = "formatted-library3",
     srcs = ["formatted/formatted-library3.scala"],
     config = ":scala3-conf",
     format = True,
-    scala_version = "3.3.4",
+    scala_version = "3.3.5",
 )
 
 scalafmt_scala_binary(

diff --git a/test_cross_build/version_specific/BUILD b/test_cross_build/version_specific/BUILD
@@ -7,7 +7,7 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
 scala_library(
     name = "since_3_3",
     srcs = ["since_3_3.scala"],
-    scala_version = "3.3.4",
+    scala_version = "3.3.5",
 )
 
 scala_library(
@@ -43,7 +43,7 @@ scala_library(
         "since_3_2.scala",
         "since_3_3.scala",
     ],
-    scala_version = "3.3.4",
+    scala_version = "3.3.5",
 )
 
 scala_library(

diff --git a/test_thirdparty_version.sh b/test_thirdparty_version.sh
@@ -16,7 +16,7 @@ runner=$(get_test_runner "${1:-local}")
 
 # Latest version of each major version
 $runner test_scala_version "3.6.3" # Latest Next version
-$runner test_scala_version "3.3.4" # Latest LTS version
+$runner test_scala_version "3.3.5" # Latest LTS version
 $runner test_scala_version "3.1.3" # First supported major for Scala 3, max supported JDK=18
 $runner test_scala_version "2.13.15"
 $runner test_scala_version "2.12.20"

diff --git a/test_version.sh b/test_version.sh
@@ -5,7 +5,7 @@ set -e
 scala_2_11_version="2.11.12"
 scala_2_12_version="2.12.20"
 scala_2_13_version="2.13.15"
-scala_3_version="3.3.4"
+scala_3_version="3.3.5"
 
 SCALA_VERSION_DEFAULT=$scala_2_11_version
 

diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl
@@ -3,7 +3,7 @@
 Mostly generated and updated by scripts/create_repository.py.
 """
 
-scala_version = "3.3.4"
+scala_version = "3.3.5"
 
 artifacts = {
     "com_geirsson_metaconfig_core": {
@@ -217,14 +217,20 @@ artifacts = {
         ],
     },
     "io_bazel_rules_scala_scala_asm": {
-        "artifact": "org.scala-lang.modules:scala-asm:9.6.0-scala-1",
-        "sha256": "bf16f8b69e89cadab550bce266a052780af7f1eb29dd1c04c3bd014113752c12",
+        "artifact": "org.scala-lang.modules:scala-asm:9.7.0-scala-2",
+        "sha256": "823cd3a46e289c69e37994e03aee3864e1e059aacb3e0bf34f536b3669b61772",
     },
     "io_bazel_rules_scala_scala_compiler": {
-        "artifact": "org.scala-lang:scala3-compiler_3:3.3.4",
-        "sha256": "2cca65fdb92e2cc393786cae61b4f7bcb9032ad4be61f9cebae1dca72997e52f",
+        "artifact": "org.scala-lang:scala3-compiler_3:3.3.5",
+        "sha256": "f067da9a52ec450efa5d1cc1a3325b7f9882874a059b11728969460d170ed424",
         "deps": [
             "@io_bazel_rules_scala_scala_asm",
+            "@io_bazel_rules_scala_scala_interfaces",
+            "@io_bazel_rules_scala_scala_library",
+            "@io_bazel_rules_scala_scala_tasty_core",
+            "@org_jline_jline_reader",
+            "@org_jline_jline_terminal",
+            "@org_jline_jline_terminal_jni",
             "@org_scala_sbt_compiler_interface",
         ],
     },
@@ -233,12 +239,12 @@ artifacts = {
         "sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
     },
     "io_bazel_rules_scala_scala_interfaces": {
-        "artifact": "org.scala-lang:scala3-interfaces:3.3.4",
-        "sha256": "fe056c10a217353e14aa62076d2bbd957ebd82e02fb445ca5546ae8ea9d40caa",
+        "artifact": "org.scala-lang:scala3-interfaces:3.3.5",
+        "sha256": "b44fcdf2d4aef100ab2a24f88b5432b3f487de91ab38f54c8e0b96cb35913c93",
     },
     "io_bazel_rules_scala_scala_library": {
-        "artifact": "org.scala-lang:scala3-library_3:3.3.4",
-        "sha256": "d95184acfcd814da2e051378e4962c653f4b468f4086452ab427af030482bd3c",
+        "artifact": "org.scala-lang:scala3-library_3:3.3.5",
+        "sha256": "26163f54674adb4c3e2151155f7f6f17095a0be10ebfb884ee8cdca98adca248",
         "deps": [
             "@io_bazel_rules_scala_scala_library_2",
         ],
@@ -269,8 +275,11 @@ artifacts = {
         ],
     },
     "io_bazel_rules_scala_scala_tasty_core": {
-        "artifact": "org.scala-lang:tasty-core_3:3.3.4",
-        "sha256": "13d44693d6f2d38e0595954d11234c0373d6d0e689a8151b06878c5b631d57d5",
+        "artifact": "org.scala-lang:tasty-core_3:3.3.5",
+        "sha256": "7e14a81eaebe0c23ac5350e5421691d46206a46ce88493450ec625ef47498922",
+        "deps": [
+            "@io_bazel_rules_scala_scala_library",
+        ],
     },
     "io_bazel_rules_scala_scala_xml": {
         "artifact": "org.scala-lang.modules:scala-xml_3:2.1.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ test_produces_semanticdb(){ @@
       fi
       if [ $scala_majver -eq 3 ]; then
-        local version_opt="--repo_env=SCALA_VERSION=3.3.4"
+        local version_opt="--repo_env=SCALA_VERSION=3.3.5"
       fi
@@ Expand Down @@