Skip to content

Commit 8f7fc6d

Browse files
authored
Upgrade scala 2.13.x version (#2) (#2)
1 parent 538d7bc commit 8f7fc6d

File tree

13 files changed

+202
-197
lines changed

13 files changed

+202
-197
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -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.18` and `2.13.12` versions.
146+
dependency providers configured for `2.11.12`, `2.12.18` and `2.13.14` 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.12")
152+
scala_config(scala_version = "2.13.14")
153153

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

dt_patches/dt_patch_test.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ run_test_local test_compiler_patch 2.13.8
114114
run_test_local test_compiler_patch 2.13.10
115115
run_test_local test_compiler_patch 2.13.11
116116
run_test_local test_compiler_patch 2.13.12
117+
run_test_local test_compiler_patch 2.13.14
117118

118119
run_test_local test_compiler_srcjar_error 2.12.11
119120
run_test_local test_compiler_srcjar_error 2.12.12
@@ -128,4 +129,5 @@ run_test_local test_compiler_srcjar_nonhermetic 2.12.17
128129
run_test_local test_compiler_srcjar_nonhermetic 2.12.18
129130

130131
run_test_local test_compiler_srcjar_nonhermetic 2.13.11
131-
run_test_local test_compiler_srcjar_nonhermetic 2.13.12
132+
run_test_local test_compiler_srcjar_nonhermetic 2.13.12
133+
run_test_local test_compiler_srcjar_nonhermetic 2.13.14

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

+3
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ srcjars_by_version = {
9797
"2.13.12": {
9898
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.12/scala-compiler-2.13.12-sources.jar?foo",
9999
},
100+
"2.13.14": {
101+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.14/scala-compiler-2.13.14-sources.jar?foo",
102+
},
100103
}
101104

102105
rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION])

examples/crossbuild/1_single/BUILD

+1-1
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.12",
17+
scala_version = "2.13.14",
1818
)
1919

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

examples/crossbuild/2_deps/BUILD

+1-1
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.12",
22+
scala_version = "2.13.14",
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ scala_binary(
2222
name = "bin2",
2323
srcs = ["bin.scala"],
2424
main_class = "B",
25-
scala_version = "2.13.12",
25+
scala_version = "2.13.14",
2626
deps = [":lib"],
2727
)
2828

examples/crossbuild/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ scala_config(
2222
scala_version = "3.3.1",
2323
scala_versions = [
2424
"2.11.12",
25-
"2.13.12",
25+
"2.13.14",
2626
"3.3.1",
2727
],
2828
)

examples/semanticdb/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ local_repository(
2121

2222
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
2323

24-
scala_config(scala_version = "2.13.12")
24+
scala_config(scala_version = "2.13.14")
2525

2626
load(
2727
"@io_bazel_rules_scala//scala:scala.bzl",

test/shell/test_scala_config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_classpath_contains_2_12() {
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.12 \
15+
--repo_env=SCALA_VERSION=2.13.14 \
1616
| grep scala-library-2.13
1717
}
1818

test_cross_build/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ scala_config(
3939
scala_versions = [
4040
"2.11.12",
4141
"2.12.18",
42-
"2.13.12",
42+
"2.13.14",
4343
"3.1.0",
4444
"3.2.1",
4545
"3.3.1",

test_cross_build/scalafmt/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ scalafmt_scala_library(
2020
srcs = ["unformatted/unformatted-library2.scala"],
2121
config = ":scala2-conf",
2222
format = True,
23-
scala_version = "2.13.12",
23+
scala_version = "2.13.14",
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.12",
31+
scala_version = "2.13.14",
3232
)
3333

3434
scalafmt_scala_library(

test_version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
scala_2_11_version="2.11.12"
66
scala_2_12_version="2.12.18"
7-
scala_2_13_version="2.13.12"
7+
scala_2_13_version="2.13.14"
88

99
SCALA_VERSION_DEFAULT=$scala_2_11_version
1010

0 commit comments

Comments
 (0)