diff --git a/README.md b/README.md index 269aa4999..0384c0582 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ scalatest_toolchain() ``` This will load the `rules_scala` repository at the commit sha -`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.19) +`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.20) Then in your BUILD file just add the following so the rules will be available: ```starlark @@ -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.19` and `2.13.14` versions. +dependency providers configured for `2.11.12`, `2.12.20` and `2.13.15` versions. ```starlark # WORKSPACE 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("@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 index 7bd9e89d9..bd1864787 100755 --- a/dt_patches/dt_patch_test.sh +++ b/dt_patches/dt_patch_test.sh @@ -102,6 +102,7 @@ run_test_local test_compiler_patch 2.12.16 run_test_local test_compiler_patch 2.12.17 run_test_local test_compiler_patch 2.12.18 run_test_local test_compiler_patch 2.12.19 +run_test_local test_compiler_patch 2.12.20 run_test_local test_compiler_patch 2.13.0 run_test_local test_compiler_patch 2.13.1 @@ -116,6 +117,7 @@ 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_patch 2.13.15 run_test_local test_compiler_srcjar_error 2.12.11 run_test_local test_compiler_srcjar_error 2.12.12 @@ -129,7 +131,9 @@ run_test_local test_compiler_srcjar 2.12.16 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.12.19 +run_test_local test_compiler_srcjar_nonhermetic 2.12.20 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.14 \ No newline at end of file +run_test_local test_compiler_srcjar_nonhermetic 2.13.14 +run_test_local test_compiler_srcjar_nonhermetic 2.13.15 \ No newline at end of file diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE index ff0cb8f27..03517d2a0 100644 --- a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE +++ b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE @@ -105,6 +105,9 @@ srcjars_by_version = { "2.12.19": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.19/scala-compiler-2.12.19-sources.jar?foo", }, + "2.12.20": { + "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.20/scala-compiler-2.12.20-sources.jar?foo", + }, "2.13.11": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.11/scala-compiler-2.13.11-sources.jar?foo", }, @@ -114,6 +117,9 @@ srcjars_by_version = { "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", }, + "2.13.15": { + "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.15/scala-compiler-2.13.15-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 index fba6ac698..b39f59706 100644 --- 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.14", + scala_version = "2.13.15", ) # 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 index b7ed66a2d..c39354498 100644 --- 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.14", + scala_version = "2.13.15", 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 index 314572089..c3a70479a 100644 --- 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.14", + scala_version = "2.13.15", deps = [":lib"], ) @@ -30,6 +30,6 @@ scala_binary( name = "bin3", srcs = ["bin.scala"], main_class = "B", - scala_version = "3.3.3", + scala_version = "3.3.4", deps = [":lib"], ) diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index 2d0e286a8..8e7883e9b 100644 --- a/examples/crossbuild/WORKSPACE +++ b/examples/crossbuild/WORKSPACE @@ -30,11 +30,11 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") scala_config( - scala_version = "3.3.3", + scala_version = "3.3.4", scala_versions = [ "2.11.12", - "2.13.14", - "3.3.3", + "2.13.15", + "3.3.4", ], ) diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE index 2e02cad76..fee68888c 100644 --- a/examples/scala3/WORKSPACE +++ b/examples/scala3/WORKSPACE @@ -29,7 +29,7 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "3.5.0") +scala_config(scala_version = "3.5.2") load( "@io_bazel_rules_scala//scala:scala.bzl", diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE index 456f76248..a006e5e94 100644 --- a/examples/semanticdb/WORKSPACE +++ b/examples/semanticdb/WORKSPACE @@ -32,7 +32,7 @@ local_repository( 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", diff --git a/scala_config.bzl b/scala_config.bzl index 3bc114775..70cf132c3 100644 --- a/scala_config.bzl +++ b/scala_config.bzl @@ -2,7 +2,7 @@ load("//scala:scala_cross_version.bzl", "extract_major_version", "extract_minor_ def _default_scala_version(): """return the scala version for use in maven coordinates""" - return "2.12.19" + return "2.12.20" def _validate_supported_scala_version(scala_major_version, scala_minor_version): if scala_major_version == "2.11" and int(scala_minor_version) != 12: diff --git a/test/shell/test_coverage_equals_in_target.sh b/test/shell/test_coverage_equals_in_target.sh index 2f37fa8e8..3dd3919e5 100755 --- a/test/shell/test_coverage_equals_in_target.sh +++ b/test/shell/test_coverage_equals_in_target.sh @@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) . "${dir}"/test_helper.sh runner=$(get_test_runner "${1:-local}") -# Default to 2.12.19 for `diff` tests because other versions change the output. -SCALA_VERSION="${SCALA_VERSION:-2.12.19}" +# Default to 2.12.20 for `diff` tests because other versions change the output. +SCALA_VERSION="${SCALA_VERSION:-2.12.20}" test_coverage_target_name_contains_equals_sign() { bazel coverage \ diff --git a/test/shell/test_coverage_scalatest.sh b/test/shell/test_coverage_scalatest.sh index e29b6adc2..f154dbb0d 100755 --- a/test/shell/test_coverage_scalatest.sh +++ b/test/shell/test_coverage_scalatest.sh @@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) . "${dir}"/test_helper.sh runner=$(get_test_runner "${1:-local}") -# Default to 2.12.19 for `diff` tests because other versions change the output. -SCALA_VERSION="${SCALA_VERSION:-2.12.19}" +# Default to 2.12.20 for `diff` tests because other versions change the output. +SCALA_VERSION="${SCALA_VERSION:-2.12.20}" test_coverage_on() { bazel coverage \ diff --git a/test/shell/test_coverage_scalatest_resources.sh b/test/shell/test_coverage_scalatest_resources.sh index 08bb38b74..0df3494ae 100755 --- a/test/shell/test_coverage_scalatest_resources.sh +++ b/test/shell/test_coverage_scalatest_resources.sh @@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) . "${dir}"/test_helper.sh runner=$(get_test_runner "${1:-local}") -# Default to 2.12.19 for `diff` tests because other versions change the output. -SCALA_VERSION="${SCALA_VERSION:-2.12.19}" +# Default to 2.12.20 for `diff` tests because other versions change the output. +SCALA_VERSION="${SCALA_VERSION:-2.12.20}" test_coverage_succeeds_resource_call() { bazel coverage \ diff --git a/test/shell/test_coverage_specs2_with_junit.sh b/test/shell/test_coverage_specs2_with_junit.sh index 725eecccd..940e00a3f 100755 --- a/test/shell/test_coverage_specs2_with_junit.sh +++ b/test/shell/test_coverage_specs2_with_junit.sh @@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) . "${dir}"/test_helper.sh runner=$(get_test_runner "${1:-local}") -# Default to 2.12.19 for `diff` tests because other versions change the output. -SCALA_VERSION="${SCALA_VERSION:-2.12.19}" +# Default to 2.12.20 for `diff` tests because other versions change the output. +SCALA_VERSION="${SCALA_VERSION:-2.12.20}" test_coverage_on() { bazel coverage \ diff --git a/test/shell/test_examples.sh b/test/shell/test_examples.sh index d77568316..e485532cd 100755 --- 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.3 //..." + test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.4 //..." } function scala3_4_example() { @@ -46,7 +46,7 @@ function scala3_4_example() { } function scala3_5_example() { - test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.5.0 //..." + test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.5.2 //..." } function semanticdb_example() { diff --git a/test/shell/test_invalid_scalacopts.sh b/test/shell/test_invalid_scalacopts.sh index 7108de058..eadd2293f 100755 --- 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.19 2.13.14 3.3.3; do +for scalaVersion in 2.12.20 2.13.15 3.3.4; 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_scala_config.sh b/test/shell/test_scala_config.sh index 4be645e58..ab17f661d 100755 --- a/test/shell/test_scala_config.sh +++ b/test/shell/test_scala_config.sh @@ -6,13 +6,13 @@ runner=$(get_test_runner "${1:-local}") test_classpath_contains_2_12() { bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \ - --repo_env=SCALA_VERSION=2.12.19 \ + --repo_env=SCALA_VERSION=2.12.20 \ | grep scala-library-2.12 } test_classpath_contains_2_13() { bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \ - --repo_env=SCALA_VERSION=2.13.14 \ + --repo_env=SCALA_VERSION=2.13.15 \ | grep scala-library-2.13 } diff --git a/test/shell/test_semanticdb.sh b/test/shell/test_semanticdb.sh index 89947160e..6adffc448 100755 --- 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.3" + local version_opt="--repo_env=SCALA_VERSION=3.3.4" fi diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index cb3f9d338..445e5de00 100644 --- a/test_cross_build/WORKSPACE +++ b/test_cross_build/WORKSPACE @@ -63,11 +63,11 @@ scala_config( scala_version = "3.1.3", scala_versions = [ "2.11.12", - "2.12.19", - "2.13.14", + "2.12.20", + "2.13.15", "3.1.3", "3.2.2", - "3.3.3", + "3.3.4", ], ) diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD index 586619277..802c8481b 100644 --- a/test_cross_build/scalafmt/BUILD +++ b/test_cross_build/scalafmt/BUILD @@ -20,7 +20,7 @@ scalafmt_scala_library( srcs = ["unformatted/unformatted-library2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.13.14", + scala_version = "2.13.15", ) scalafmt_scala_library( @@ -28,7 +28,7 @@ scalafmt_scala_library( srcs = ["formatted/formatted-library2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.13.14", + scala_version = "2.13.15", ) scalafmt_scala_library( @@ -36,7 +36,7 @@ scalafmt_scala_library( srcs = ["unformatted/unformatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.3", + scala_version = "3.3.4", ) scalafmt_scala_library( @@ -44,7 +44,7 @@ scalafmt_scala_library( srcs = ["formatted/formatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.3", + scala_version = "3.3.4", ) scalafmt_scala_binary( @@ -53,7 +53,7 @@ scalafmt_scala_binary( config = ":scala2-conf", format = True, main_class = "UnformattedBinary", - scala_version = "2.12.19", + scala_version = "2.12.20", ) scalafmt_scala_library( @@ -62,7 +62,7 @@ scalafmt_scala_library( config = ":scala2-conf", format = True, main_class = "UnformattedBinary", - scala_version = "2.12.19", + scala_version = "2.12.20", ) scalafmt_scala_binary( @@ -88,7 +88,7 @@ scalafmt_scala_test( srcs = ["unformatted/unformatted-test2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.12.19", + scala_version = "2.12.20", ) scalafmt_scala_test( @@ -96,7 +96,7 @@ scalafmt_scala_test( srcs = ["formatted/formatted-test2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.12.19", + scala_version = "2.12.20", ) #default scala version is 3.1.3 diff --git a/test_cross_build/version_specific/BUILD b/test_cross_build/version_specific/BUILD index e9401a760..4eb341972 100644 --- 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.3", + scala_version = "3.3.4", ) scala_library( @@ -43,7 +43,7 @@ scala_library( "since_3_2.scala", "since_3_3.scala", ], - scala_version = "3.3.3", + scala_version = "3.3.4", ) scala_library( diff --git a/test_version.sh b/test_version.sh index cd4a60ec4..8babe29db 100755 --- a/test_version.sh +++ b/test_version.sh @@ -3,8 +3,8 @@ set -e scala_2_11_version="2.11.12" -scala_2_12_version="2.12.19" -scala_2_13_version="2.13.14" +scala_2_12_version="2.12.20" +scala_2_13_version="2.13.15" SCALA_VERSION_DEFAULT=$scala_2_11_version