Skip to content

Commit 531d85f

Browse files
committed
Update changed versions used in tests
1 parent 24848c1 commit 531d85f

22 files changed

+53
-43
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ scalatest_toolchain()
8888
```
8989

9090
This will load the `rules_scala` repository at the commit sha
91-
`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.19)
91+
`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.20)
9292

9393
Then in your BUILD file just add the following so the rules will be available:
9494
```starlark
@@ -143,13 +143,13 @@ Previous minor versions may work but are supported only on a best effort basis.
143143
To configure Scala version you must call `scala_config(scala_version = "2.xx.xx")` and configure
144144
dependencies by declaring [scala_toolchain](docs/scala_toolchain.md).
145145
For a quick start you can use `scala_repositories()` and `scala_register_toolchains()`, which have
146-
dependency providers configured for `2.11.12`, `2.12.19` and `2.13.14` versions.
146+
dependency providers configured for `2.11.12`, `2.12.20` and `2.13.15` versions.
147147

148148

149149
```starlark
150150
# WORKSPACE
151151
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
152-
scala_config(scala_version = "2.13.14")
152+
scala_config(scala_version = "2.13.15")
153153

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

dt_patches/dt_patch_test.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ run_test_local test_compiler_patch 2.12.16
102102
run_test_local test_compiler_patch 2.12.17
103103
run_test_local test_compiler_patch 2.12.18
104104
run_test_local test_compiler_patch 2.12.19
105+
run_test_local test_compiler_patch 2.12.20
105106

106107
run_test_local test_compiler_patch 2.13.0
107108
run_test_local test_compiler_patch 2.13.1
@@ -116,6 +117,7 @@ run_test_local test_compiler_patch 2.13.10
116117
run_test_local test_compiler_patch 2.13.11
117118
run_test_local test_compiler_patch 2.13.12
118119
run_test_local test_compiler_patch 2.13.14
120+
run_test_local test_compiler_patch 2.13.15
119121

120122
run_test_local test_compiler_srcjar_error 2.12.11
121123
run_test_local test_compiler_srcjar_error 2.12.12
@@ -129,7 +131,9 @@ run_test_local test_compiler_srcjar 2.12.16
129131
run_test_local test_compiler_srcjar_nonhermetic 2.12.17
130132
run_test_local test_compiler_srcjar_nonhermetic 2.12.18
131133
run_test_local test_compiler_srcjar_nonhermetic 2.12.19
134+
run_test_local test_compiler_srcjar_nonhermetic 2.12.20
132135

133136
run_test_local test_compiler_srcjar_nonhermetic 2.13.11
134137
run_test_local test_compiler_srcjar_nonhermetic 2.13.12
135-
run_test_local test_compiler_srcjar_nonhermetic 2.13.14
138+
run_test_local test_compiler_srcjar_nonhermetic 2.13.14
139+
run_test_local test_compiler_srcjar_nonhermetic 2.13.15

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ srcjars_by_version = {
105105
"2.12.19": {
106106
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.19/scala-compiler-2.12.19-sources.jar?foo",
107107
},
108+
"2.12.20": {
109+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.20/scala-compiler-2.12.20-sources.jar?foo",
110+
},
108111
"2.13.11": {
109112
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.11/scala-compiler-2.13.11-sources.jar?foo",
110113
},
@@ -114,6 +117,9 @@ srcjars_by_version = {
114117
"2.13.14": {
115118
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.14/scala-compiler-2.13.14-sources.jar?foo",
116119
},
120+
"2.13.15": {
121+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.15/scala-compiler-2.13.15-sources.jar?foo",
122+
},
117123
}
118124

119125
rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION])

examples/crossbuild/1_single/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ scala_library(
1414
scala_test(
1515
name = "test213",
1616
srcs = ["test.scala"],
17-
scala_version = "2.13.14",
17+
scala_version = "2.13.15",
1818
)
1919

2020
# This one will be compiled by 3.3 compiler (the default one):

examples/crossbuild/2_deps/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ scala_binary(
1919
name = "bin213",
2020
srcs = ["bin.scala"], # compiled with 2.13 (as per `scala_version`)
2121
main_class = "C",
22-
scala_version = "2.13.14",
22+
scala_version = "2.13.15",
2323
deps = [
2424
":lib", # compiled 2.13 (as per `scala_version`)
2525
":lib211", # compiled with 2.11 (that target overrides version)

examples/crossbuild/3_select/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ scala_binary(
2222
name = "bin2",
2323
srcs = ["bin.scala"],
2424
main_class = "B",
25-
scala_version = "2.13.14",
25+
scala_version = "2.13.15",
2626
deps = [":lib"],
2727
)
2828

2929
scala_binary(
3030
name = "bin3",
3131
srcs = ["bin.scala"],
3232
main_class = "B",
33-
scala_version = "3.3.3",
33+
scala_version = "3.3.4",
3434
deps = [":lib"],
3535
)

examples/crossbuild/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ local_repository(
3030
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

3232
scala_config(
33-
scala_version = "3.3.3",
33+
scala_version = "3.3.4",
3434
scala_versions = [
3535
"2.11.12",
36-
"2.13.14",
37-
"3.3.3",
36+
"2.13.15",
37+
"3.3.4",
3838
],
3939
)
4040

examples/scala3/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ local_repository(
2929

3030
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3131

32-
scala_config(scala_version = "3.5.0")
32+
scala_config(scala_version = "3.5.2")
3333

3434
load(
3535
"@io_bazel_rules_scala//scala:scala.bzl",

examples/semanticdb/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ local_repository(
3232

3333
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3434

35-
scala_config(scala_version = "2.13.14")
35+
scala_config(scala_version = "2.13.15")
3636

3737
load(
3838
"@io_bazel_rules_scala//scala:scala.bzl",

scala_config.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load("//scala:scala_cross_version.bzl", "extract_major_version", "extract_minor_
22

33
def _default_scala_version():
44
"""return the scala version for use in maven coordinates"""
5-
return "2.12.19"
5+
return "2.12.20"
66

77
def _validate_supported_scala_version(scala_major_version, scala_minor_version):
88
if scala_major_version == "2.11" and int(scala_minor_version) != 12:

test/shell/test_coverage_equals_in_target.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
44
. "${dir}"/test_helper.sh
55
runner=$(get_test_runner "${1:-local}")
66

7-
# Default to 2.12.19 for `diff` tests because other versions change the output.
8-
SCALA_VERSION="${SCALA_VERSION:-2.12.19}"
7+
# Default to 2.12.20 for `diff` tests because other versions change the output.
8+
SCALA_VERSION="${SCALA_VERSION:-2.12.20}"
99

1010
test_coverage_target_name_contains_equals_sign() {
1111
bazel coverage \

test/shell/test_coverage_scalatest.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
44
. "${dir}"/test_helper.sh
55
runner=$(get_test_runner "${1:-local}")
66

7-
# Default to 2.12.19 for `diff` tests because other versions change the output.
8-
SCALA_VERSION="${SCALA_VERSION:-2.12.19}"
7+
# Default to 2.12.20 for `diff` tests because other versions change the output.
8+
SCALA_VERSION="${SCALA_VERSION:-2.12.20}"
99

1010
test_coverage_on() {
1111
bazel coverage \

test/shell/test_coverage_scalatest_resources.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
44
. "${dir}"/test_helper.sh
55
runner=$(get_test_runner "${1:-local}")
66

7-
# Default to 2.12.19 for `diff` tests because other versions change the output.
8-
SCALA_VERSION="${SCALA_VERSION:-2.12.19}"
7+
# Default to 2.12.20 for `diff` tests because other versions change the output.
8+
SCALA_VERSION="${SCALA_VERSION:-2.12.20}"
99

1010
test_coverage_succeeds_resource_call() {
1111
bazel coverage \

test/shell/test_coverage_specs2_with_junit.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
44
. "${dir}"/test_helper.sh
55
runner=$(get_test_runner "${1:-local}")
66

7-
# Default to 2.12.19 for `diff` tests because other versions change the output.
8-
SCALA_VERSION="${SCALA_VERSION:-2.12.19}"
7+
# Default to 2.12.20 for `diff` tests because other versions change the output.
8+
SCALA_VERSION="${SCALA_VERSION:-2.12.20}"
99

1010
test_coverage_on() {
1111
bazel coverage \

test/shell/test_examples.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ function scala3_2_example() {
3838
}
3939

4040
function scala3_3_example() {
41-
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.3 //..."
41+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.4 //..."
4242
}
4343

4444
function scala3_4_example() {
4545
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.4.3 //..."
4646
}
4747

4848
function scala3_5_example() {
49-
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.5.0 //..."
49+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.5.2 //..."
5050
}
5151

5252
function semanticdb_example() {

test/shell/test_invalid_scalacopts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test_logs_not_contains() {
2525
2>&1 | grep -v "$expected"
2626
}
2727

28-
for scalaVersion in 2.12.19 2.13.14 3.3.3; do
28+
for scalaVersion in 2.12.20 2.13.15 3.3.4; do
2929
if [[ "$scalaVersion" == 3.* ]]; then
3030
$runner test_logs_contains $scalaVersion "not-existing is not a valid choice for -source"
3131
else

test/shell/test_scala_config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ runner=$(get_test_runner "${1:-local}")
66

77
test_classpath_contains_2_12() {
88
bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \
9-
--repo_env=SCALA_VERSION=2.12.19 \
9+
--repo_env=SCALA_VERSION=2.12.20 \
1010
| grep scala-library-2.12
1111
}
1212

1313
test_classpath_contains_2_13() {
1414
bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \
15-
--repo_env=SCALA_VERSION=2.13.14 \
15+
--repo_env=SCALA_VERSION=2.13.15 \
1616
| grep scala-library-2.13
1717
}
1818

test/shell/test_semanticdb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test_produces_semanticdb(){
3030
fi
3131

3232
if [ $scala_majver -eq 3 ]; then
33-
local version_opt="--repo_env=SCALA_VERSION=3.3.3"
33+
local version_opt="--repo_env=SCALA_VERSION=3.3.4"
3434
fi
3535

3636

test_cross_build/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ scala_config(
6363
scala_version = "3.1.3",
6464
scala_versions = [
6565
"2.11.12",
66-
"2.12.19",
67-
"2.13.14",
66+
"2.12.20",
67+
"2.13.15",
6868
"3.1.3",
6969
"3.2.2",
70-
"3.3.3",
70+
"3.3.4",
7171
],
7272
)
7373

test_cross_build/scalafmt/BUILD

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@ scalafmt_scala_library(
2020
srcs = ["unformatted/unformatted-library2.scala"],
2121
config = ":scala2-conf",
2222
format = True,
23-
scala_version = "2.13.14",
23+
scala_version = "2.13.15",
2424
)
2525

2626
scalafmt_scala_library(
2727
name = "formatted-library2",
2828
srcs = ["formatted/formatted-library2.scala"],
2929
config = ":scala2-conf",
3030
format = True,
31-
scala_version = "2.13.14",
31+
scala_version = "2.13.15",
3232
)
3333

3434
scalafmt_scala_library(
3535
name = "unformatted-library3",
3636
srcs = ["unformatted/unformatted-library3.scala"],
3737
config = ":scala3-conf",
3838
format = True,
39-
scala_version = "3.3.3",
39+
scala_version = "3.3.4",
4040
)
4141

4242
scalafmt_scala_library(
4343
name = "formatted-library3",
4444
srcs = ["formatted/formatted-library3.scala"],
4545
config = ":scala3-conf",
4646
format = True,
47-
scala_version = "3.3.3",
47+
scala_version = "3.3.4",
4848
)
4949

5050
scalafmt_scala_binary(
@@ -53,7 +53,7 @@ scalafmt_scala_binary(
5353
config = ":scala2-conf",
5454
format = True,
5555
main_class = "UnformattedBinary",
56-
scala_version = "2.12.19",
56+
scala_version = "2.12.20",
5757
)
5858

5959
scalafmt_scala_library(
@@ -62,7 +62,7 @@ scalafmt_scala_library(
6262
config = ":scala2-conf",
6363
format = True,
6464
main_class = "UnformattedBinary",
65-
scala_version = "2.12.19",
65+
scala_version = "2.12.20",
6666
)
6767

6868
scalafmt_scala_binary(
@@ -88,15 +88,15 @@ scalafmt_scala_test(
8888
srcs = ["unformatted/unformatted-test2.scala"],
8989
config = ":scala2-conf",
9090
format = True,
91-
scala_version = "2.12.19",
91+
scala_version = "2.12.20",
9292
)
9393

9494
scalafmt_scala_test(
9595
name = "formatted-test2",
9696
srcs = ["formatted/formatted-test2.scala"],
9797
config = ":scala2-conf",
9898
format = True,
99-
scala_version = "2.12.19",
99+
scala_version = "2.12.20",
100100
)
101101

102102
#default scala version is 3.1.3

test_cross_build/version_specific/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
77
scala_library(
88
name = "since_3_3",
99
srcs = ["since_3_3.scala"],
10-
scala_version = "3.3.3",
10+
scala_version = "3.3.4",
1111
)
1212

1313
scala_library(
@@ -43,7 +43,7 @@ scala_library(
4343
"since_3_2.scala",
4444
"since_3_3.scala",
4545
],
46-
scala_version = "3.3.3",
46+
scala_version = "3.3.4",
4747
)
4848

4949
scala_library(

test_version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
set -e
44

55
scala_2_11_version="2.11.12"
6-
scala_2_12_version="2.12.19"
7-
scala_2_13_version="2.13.14"
6+
scala_2_12_version="2.12.20"
7+
scala_2_13_version="2.13.15"
88

99
SCALA_VERSION_DEFAULT=$scala_2_11_version
1010

0 commit comments

Comments
 (0)