Skip to content

Commit 6613ffc

Browse files
authored
Updated artifact versions with sha sums and scala versions (bazel-contrib#1597)
* bumped artifact versions with sha sums and scala versions * reset cla * removed library version update * update sha sums * update scala version in workspace * update scala version in workspace and build * update scala version in workspaces and build * removed scalafmt updated versions * removed docs update * removed support for 3.4.2 due to failing scala3_4_example * removed support for 3.4.2 due to failing scala3_4_example * lint issue * update
1 parent 6c6ba4e commit 6613ffc

File tree

23 files changed

+90
-80
lines changed

23 files changed

+90
-80
lines changed

.bazelci/presubmit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ tasks:
2727
platform: ubuntu2004
2828
shell_commands:
2929
# Install xmllint
30-
- sudo apt update && sudo apt install -y libxml2-utils
30+
- sudo apt update && sudo apt install --reinstall libxml2-utils -y
3131
- "./test_rules_scala.sh"
3232
test_rules_scala_linux_last_green:
3333
name: "./test_rules_scala (Bazel green head)"
3434
platform: ubuntu2004
3535
bazel: last_green
3636
shell_commands:
3737
# Install xmllint
38-
- sudo apt update && sudo apt install -y libxml2-utils
38+
- sudo apt update && sudo apt install --reinstall libxml2-utils -y
3939
- "./test_rules_scala.sh || buildkite-agent annotate --style 'warning' \"Optional build with latest Bazel version failed, [see here](${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}) (It is not mandatory but worth checking)\""
4040
test_rules_scala_macos:
4141
name: "./test_rules_scala"

README.md

+3-3
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.18)
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)
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.18` and `2.13.12` versions.
146+
dependency providers configured for `2.11.12`, `2.12.19` 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

+5-1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ run_test_local test_compiler_patch 2.12.15
101101
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
104+
run_test_local test_compiler_patch 2.12.19
104105

105106
run_test_local test_compiler_patch 2.13.0
106107
run_test_local test_compiler_patch 2.13.1
@@ -114,6 +115,7 @@ run_test_local test_compiler_patch 2.13.8
114115
run_test_local test_compiler_patch 2.13.10
115116
run_test_local test_compiler_patch 2.13.11
116117
run_test_local test_compiler_patch 2.13.12
118+
run_test_local test_compiler_patch 2.13.14
117119

118120
run_test_local test_compiler_srcjar_error 2.12.11
119121
run_test_local test_compiler_srcjar_error 2.12.12
@@ -126,6 +128,8 @@ run_test_local test_compiler_srcjar 2.12.15
126128
run_test_local test_compiler_srcjar 2.12.16
127129
run_test_local test_compiler_srcjar_nonhermetic 2.12.17
128130
run_test_local test_compiler_srcjar_nonhermetic 2.12.18
131+
run_test_local test_compiler_srcjar_nonhermetic 2.12.19
129132

130133
run_test_local test_compiler_srcjar_nonhermetic 2.13.11
131-
run_test_local test_compiler_srcjar_nonhermetic 2.13.12
134+
run_test_local test_compiler_srcjar_nonhermetic 2.13.12
135+
run_test_local test_compiler_srcjar_nonhermetic 2.13.14

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

+6
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,18 @@ srcjars_by_version = {
9191
"2.12.18": {
9292
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.18/scala-compiler-2.12.18-sources.jar?foo",
9393
},
94+
"2.12.19": {
95+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.19/scala-compiler-2.12.19-sources.jar?foo",
96+
},
9497
"2.13.11": {
9598
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.11/scala-compiler-2.13.11-sources.jar?foo",
9699
},
97100
"2.13.12": {
98101
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.12/scala-compiler-2.13.12-sources.jar?foo",
99102
},
103+
"2.13.14": {
104+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.14/scala-compiler-2.13.14-sources.jar?foo",
105+
},
100106
}
101107

102108
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

+2-2
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.12",
25+
scala_version = "2.13.14",
2626
deps = [":lib"],
2727
)
2828

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

examples/crossbuild/WORKSPACE

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ local_repository(
1919
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
2020

2121
scala_config(
22-
scala_version = "3.3.1",
22+
scala_version = "3.3.3",
2323
scala_versions = [
2424
"2.11.12",
25-
"2.13.12",
26-
"3.3.1",
25+
"2.13.14",
26+
"3.3.3",
2727
],
2828
)
2929

examples/scala3/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ local_repository(
1818

1919
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
2020

21-
scala_config(scala_version = "3.3.1")
21+
scala_config(scala_version = "3.3.3")
2222

2323
load(
2424
"@io_bazel_rules_scala//scala:scala.bzl",

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",

scala_config.bzl

+1-1
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.18"
5+
return "2.12.19"
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_examples.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function multi_framework_toolchain_example() {
3030
}
3131

3232
function scala3_1_example() {
33-
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.1.0 //..."
33+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.1.3 //..."
3434
}
3535

3636
function scala3_2_example() {
37-
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.2.1 //..."
37+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.2.2 //..."
3838
}
3939

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

4444
function semanticdb_example() {

test/shell/test_scala_config.sh

+2-2
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.18 \
9+
--repo_env=SCALA_VERSION=2.12.19 \
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.12 \
15+
--repo_env=SCALA_VERSION=2.13.14 \
1616
| grep scala-library-2.13
1717
}
1818

test/shell/test_semanticdb.sh

+1-1
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.1"
33+
local version_opt="--repo_env=SCALA_VERSION=3.3.3"
3434
fi
3535

3636

test_cross_build/WORKSPACE

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ local_repository(
3535
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
3636

3737
scala_config(
38-
scala_version = "3.1.0",
38+
scala_version = "3.1.3",
3939
scala_versions = [
4040
"2.11.12",
41-
"2.12.18",
42-
"2.13.12",
43-
"3.1.0",
44-
"3.2.1",
45-
"3.3.1",
41+
"2.12.19",
42+
"2.13.14",
43+
"3.1.3",
44+
"3.2.2",
45+
"3.3.3",
4646
],
4747
)
4848

test_cross_build/scalafmt/BUILD

+11-11
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.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(
3535
name = "unformatted-library3",
3636
srcs = ["unformatted/unformatted-library3.scala"],
3737
config = ":scala3-conf",
3838
format = True,
39-
scala_version = "3.3.1",
39+
scala_version = "3.3.3",
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.1",
47+
scala_version = "3.3.3",
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.18",
56+
scala_version = "2.12.19",
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.18",
65+
scala_version = "2.12.19",
6666
)
6767

6868
scalafmt_scala_binary(
@@ -71,7 +71,7 @@ scalafmt_scala_binary(
7171
config = ":scala3-conf",
7272
format = True,
7373
main_class = "UnformattedBinary",
74-
scala_version = "3.2.1",
74+
scala_version = "3.2.2",
7575
)
7676

7777
scalafmt_scala_library(
@@ -80,26 +80,26 @@ scalafmt_scala_library(
8080
config = ":scala3-conf",
8181
format = True,
8282
main_class = "UnformattedBinary",
83-
scala_version = "3.2.1",
83+
scala_version = "3.2.2",
8484
)
8585

8686
scalafmt_scala_test(
8787
name = "unformatted-test2",
8888
srcs = ["unformatted/unformatted-test2.scala"],
8989
config = ":scala2-conf",
9090
format = True,
91-
scala_version = "2.12.18",
91+
scala_version = "2.12.19",
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.18",
99+
scala_version = "2.12.19",
100100
)
101101

102-
#default scala version is 3.1.0
102+
#default scala version is 3.1.3
103103
scalafmt_scala_test(
104104
name = "unformatted-test3",
105105
srcs = ["unformatted/unformatted-test3.scala"],

test_cross_build/version_specific/BUILD

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@ 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.1",
10+
scala_version = "3.3.3",
1111
)
1212

1313
scala_library(
1414
name = "before_3_3",
1515
srcs = ["before_3_3.scala"],
16-
scala_version = "3.2.1",
16+
scala_version = "3.2.2",
1717
)
1818

1919
# What's new in 3.2
2020
scala_library(
2121
name = "since_3_2",
2222
srcs = ["since_3_2.scala"],
23-
scala_version = "3.2.1",
23+
scala_version = "3.2.2",
2424
)
2525

2626
scala_library(
2727
name = "before_3_2",
2828
srcs = ["before_3_2.scala"],
29-
scala_version = "3.1.0",
29+
scala_version = "3.1.3",
3030
)
3131

3232
# What's new in 3.1
3333
scala_library(
3434
name = "since_3_1",
3535
srcs = ["since_3_1.scala"],
36-
scala_version = "3.1.0",
36+
scala_version = "3.1.3",
3737
)
3838

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

4949
scala_library(
@@ -53,7 +53,7 @@ scala_library(
5353
"since_3_1.scala",
5454
"since_3_2.scala",
5555
],
56-
scala_version = "3.2.1",
56+
scala_version = "3.2.2",
5757
)
5858

5959
scala_library(
@@ -63,5 +63,5 @@ scala_library(
6363
"before_3_3.scala",
6464
"since_3_1.scala",
6565
],
66-
scala_version = "3.1.0",
66+
scala_version = "3.1.3",
6767
)

0 commit comments

Comments
 (0)