Skip to content

Upgrade scala 2.12.x and 2.13.x versions #1515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 2, 2023
Merged

Upgrade scala 2.12.x and 2.13.x versions #1515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e242fb1
Upgrade to Scala 2.13.11
scoquelin Sep 27, 2023
b9d6f93
Upgrade to Scala 2.12.18
scoquelin Sep 27, 2023
bd59c36
Rename org_spire_math_kind_projector to org_typelevel_kind_projector
scoquelin Sep 27, 2023
cb25892
Fix expected-coverage.dat files
scoquelin Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,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.14)
`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.18)

Then in your BUILD file just add the following so the rules will be available:
```starlark
Expand Down Expand Up @@ -145,13 +145,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.14` and `2.13.6` versions.
dependency providers configured for `2.11.12`, `2.12.18` and `2.13.11` versions.


```starlark
# WORKSPACE
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
scala_config(scala_version = "2.13.6")
scala_config(scala_version = "2.13.11")

load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
rules_proto_dependencies()
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ repositories(
# validated against it
"org_springframework_spring_core",
"org_springframework_spring_tx",
"org_spire_math_kind_projector",
"org_typelevel_kind_projector",
# For testing that we don't include sources jars to the classpath
"org_typelevel__cats_core",
],
Expand Down
7 changes: 6 additions & 1 deletion dt_patches/dt_patch_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ run_test_local test_compiler_patch 2.12.13
run_test_local test_compiler_patch 2.12.14
run_test_local test_compiler_patch 2.12.15
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.13.0
run_test_local test_compiler_patch 2.13.1
Expand All @@ -105,6 +107,8 @@ run_test_local test_compiler_patch 2.13.5
run_test_local test_compiler_patch 2.13.6
run_test_local test_compiler_patch 2.13.7
run_test_local test_compiler_patch 2.13.8
run_test_local test_compiler_patch 2.13.10
run_test_local test_compiler_patch 2.13.11

run_test_local test_compiler_srcjar_error 2.12.11
run_test_local test_compiler_srcjar_error 2.12.12
Expand All @@ -115,4 +119,5 @@ run_test_local test_compiler_srcjar_error 2.12.13
run_test_local test_compiler_srcjar 2.12.14
run_test_local test_compiler_srcjar 2.12.15
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.17
run_test_local test_compiler_srcjar_nonhermetic 2.12.18
3 changes: 3 additions & 0 deletions dt_patches/test_dt_patches_user_srcjar/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ srcjars_by_version = {
"2.12.17": {
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.17/scala-compiler-2.12.17-sources.jar?foo",
},
"2.12.18": {
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.18/scala-compiler-2.12.18-sources.jar?foo",
},
}

rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION])
Expand Down
2 changes: 1 addition & 1 deletion scala_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.14"
return "2.12.18"

def _validate_supported_scala_version(scala_major_version, scala_minor_version):
if scala_major_version == "2.11" and int(scala_minor_version) != 12:
Expand Down
8 changes: 4 additions & 4 deletions test/coverage_filename_encoding/expected-coverage.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ FNDA:1,coverage_filename_encoding/A1$::a1 (Z)Ljava/lang/String;
FNDA:0,coverage_filename_encoding/A1::a1 (Z)Ljava/lang/String;
FNF:4
FNH:3
BRDA:5,0,0,0
BRDA:5,0,1,1
BRDA:5,0,0,1
BRDA:5,0,1,0
BRF:2
BRH:1
DA:3,1
DA:5,1
DA:6,1
DA:6,0
DA:7,1
LH:4
LH:3
LF:4
end_of_record
8 changes: 4 additions & 4 deletions test/coverage_scalatest/expected-coverage.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ FNDA:1,coverage_scalatest/A1$::a1 (Z)Lcoverage_scalatest/B1$;
FNDA:0,coverage_scalatest/A1::a1 (Z)Lcoverage_scalatest/B1$;
FNF:4
FNH:3
BRDA:5,0,0,0
BRDA:5,0,1,1
BRDA:5,0,0,1
BRDA:5,0,1,0
BRF:2
BRH:1
DA:3,1
DA:5,1
DA:6,1
DA:6,0
DA:7,1
LH:4
LH:3
Comment on lines +12 to +20
Copy link
Contributor Author

@scoquelin scoquelin Sep 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure where the changes in the coverage files comes from but after generating and inspecting coverage reports new changes are definitely more accurate as the failure case for A1.a1(false) was actually not covered by the test and is now depicted as a missing branch in the report.

Before :

expected-coverage-scalatest

After :

actual-coverage-scalatest

LF:4
end_of_record
SF:test/coverage_scalatest/A2.scala
Expand Down
8 changes: 4 additions & 4 deletions test/coverage_specs2_with_junit/expected-coverage.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ FNDA:1,coverage_specs2_with_junit/A1$::a1 (Z)Lcoverage_specs2_with_junit/B1$;
FNDA:0,coverage_specs2_with_junit/A1::a1 (Z)Lcoverage_specs2_with_junit/B1$;
FNF:4
FNH:3
BRDA:5,0,0,0
BRDA:5,0,1,1
BRDA:5,0,0,1
BRDA:5,0,1,0
BRF:2
BRH:1
DA:3,1
DA:5,1
DA:6,1
DA:6,0
DA:7,1
LH:4
LH:3
LF:4
end_of_record
SF:test/coverage_specs2_with_junit/A2.scala
Expand Down
4 changes: 2 additions & 2 deletions test/shell/test_scala_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.14 \
--repo_env=SCALA_VERSION=2.12.18 \
| 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.6 \
--repo_env=SCALA_VERSION=2.13.11 \
| grep scala-library-2.13
}

Expand Down
2 changes: 1 addition & 1 deletion test/src/main/scala/scalarules/test/compiler_plugin/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ scala_library(
name = "compiler_plugin",
testonly = True,
srcs = ["KindProjected.scala"],
plugins = ["@org_spire_math_kind_projector//jar"],
plugins = ["@org_typelevel_kind_projector//jar"],
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion test/src/main/scala/scalarules/test/compiler_plugin/KindProjected.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package scalarules.test.compiler_plugin
import scala.language.higherKinds

class HKT[F[_]]
class KKTImpl extends HKT[Either[String, ?]]
class KKTImpl extends HKT[Either[String, *]]
Copy link
Contributor Author

@scoquelin scoquelin Sep 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has broken compilation for this file (since Scala 2.12.16) as ? was repurposed for Scala 3. Found out that replacing ? by * was the simplest workaround to avoid bringing -Xsource:3 (and more) compiler flags just yet.

See https://docs.scala-lang.org/scala3/guides/migration/plugin-kind-projector.html for more info... this one took me a bit to figure out 😅

4 changes: 2 additions & 2 deletions test_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
set -e

scala_2_11_version="2.11.12"
scala_2_12_version="2.12.14"
scala_2_13_version="2.13.6"
scala_2_12_version="2.12.18"
scala_2_13_version="2.13.11"

SCALA_VERSION_DEFAULT=$scala_2_11_version

Expand Down
6 changes: 3 additions & 3 deletions third_party/repositories/scala_2_11.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,9 @@ artifacts = {
"@org_springframework_spring_core",
],
},
"org_spire_math_kind_projector": {
"org_typelevel_kind_projector": {
"testonly": True,
"artifact": "org.spire-math:kind-projector_2.11:0.9.10",
"sha256": "897460d4488b7dd6ac9198937d6417b36cc6ec8ab3693fdf2c532652f26c4373",
"artifact": "org.typelevel:kind-projector_%s:0.13.2" % scala_version,
"sha256": "8f7287973f7f8fc9372b59d36120e3fac5839344f65c8f640351794e8907145c",
},
}
18 changes: 9 additions & 9 deletions third_party/repositories/scala_2_12.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
scala_version = "2.12.14"
scala_version = "2.12.18"

artifacts = {
"io_bazel_rules_scala_scala_library": {
"artifact": "org.scala-lang:scala-library:%s" % scala_version,
"sha256": "0451dce8322903a6c2aa7d31232b54daa72a61ced8ade0b4c5022442a3f6cb57",
"sha256": "e51e6636c003359e106bea4ad99def70e613c290190c8c84f10f9560dd5b00ae",
},
"io_bazel_rules_scala_scala_compiler": {
"artifact": "org.scala-lang:scala-compiler:%s" % scala_version,
"sha256": "2a1b3fbf9c956073c8c5374098a6f987e3b8d76e34756ab985fc7d2ca37ee113",
"sha256": "5680cee34200e8d8ed7965c71d8b1428d3eeb889eb14fec38d40ffbc3761a0d0",
},
"io_bazel_rules_scala_scala_reflect": {
"artifact": "org.scala-lang:scala-reflect:%s" % scala_version,
"sha256": "497f4603e9d19dc4fa591cd467de5e32238d240bbd955d3dac6390b270889522",
"sha256": "d6a24e175246541ffcbc965a231aa1d3bb01d61def196f91495690fabf9783bc",
},
"io_bazel_rules_scala_scalatest": {
"artifact": "org.scalatest:scalatest_2.12:3.2.9",
Expand Down Expand Up @@ -152,8 +152,8 @@ artifacts = {
"sha256": "b5f1d6071f1548d05be82f59f9039c7d37a1787bd8e3c677e31ee275af4a4621",
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.12.14",
"sha256": "52c37b4e5a37146a9ce5e48b8fb2c39aa0ec7eb867c65708a5cdac786ac79f2a",
"artifact": "org.scala-lang:scalap:2.12.18",
"sha256": "9070f22699b961ace3dc8daef1b40aab6a586e10ab2bb4febeb3886654fe0a69",
"deps": [
"@io_bazel_rules_scala_scala_compiler",
],
Expand Down Expand Up @@ -504,9 +504,9 @@ artifacts = {
"@org_springframework_spring_core",
],
},
"org_spire_math_kind_projector": {
"org_typelevel_kind_projector": {
"testonly": True,
"artifact": "org.spire-math:kind-projector_2.12:0.9.10",
"sha256": "36aca2493302e2c037328107a121cda1d28bf9119fbc04fb47ea1ff9bce3c03f",
"artifact": "org.typelevel:kind-projector_%s:0.13.2" % scala_version,
"sha256": "7d4e821b86647c65546c1e3667348e8168c5907e9d4b277cc2badedcd479be44",
},
}
19 changes: 9 additions & 10 deletions third_party/repositories/scala_2_13.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
scala_version = "2.13.6"
scala_version = "2.13.11"

artifacts = {
"io_bazel_rules_scala_scala_library": {
"artifact": "org.scala-lang:scala-library:%s" % scala_version,
"sha256": "f19ed732e150d3537794fd3fe42ee18470a3f707efd499ecd05a99e727ff6c8a",
"sha256": "71853291f61bda32786a866533361cae474344f5b2772a379179b02112444ed3",
},
"io_bazel_rules_scala_scala_compiler": {
"artifact": "org.scala-lang:scala-compiler:%s" % scala_version,
"sha256": "310d263d622a3d016913e94ee00b119d270573a5ceaa6b21312d69637fd9eec1",
"sha256": "c5a14770370e73a69367b131da1533890200b1e2aa70643b73f9ff31ef2e69ec",
},
"io_bazel_rules_scala_scala_reflect": {
"artifact": "org.scala-lang:scala-reflect:%s" % scala_version,
"sha256": "f713593809b387c60935bb9a940dfcea53bd0dbf8fdc8d10739a2896f8ac56fa",
"sha256": "6a46ed9b333857e8b5ea668bb254ed8e47dacd1116bf53ade9467aa4ae8f1818",
},
"io_bazel_rules_scala_scala_parallel_collections": {
"artifact": "org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0",
Expand Down Expand Up @@ -157,8 +157,8 @@ artifacts = {
"sha256": "b5f1d6071f1548d05be82f59f9039c7d37a1787bd8e3c677e31ee275af4a4621",
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.13.6",
"sha256": "bbfa4ab0603f510b16114371a35b9c34d20946edfc1aa8f3fd31014b9f06b5b1",
"artifact": "org.scala-lang:scalap:2.13.11",
"sha256": "ac358699f40002fb4f32ad77531765fce23425d0e83c51854d1635118ab285ea",
"deps": [
"@io_bazel_rules_scala_scala_compiler",
],
Expand Down Expand Up @@ -509,10 +509,9 @@ artifacts = {
"@org_springframework_spring_core",
],
},
# TODO: fix misleading artifact group in id
"org_spire_math_kind_projector": {
"org_typelevel_kind_projector": {
"testonly": True,
"artifact": "org.typelevel:kind-projector_2.13:0.10.3",
"sha256": "b5d60c8bc8f1333e2deac17d72d41bb59c53283a67ff3a613189746ce97ac8ad",
"artifact": "org.typelevel:kind-projector_%s:0.13.2" % scala_version,
"sha256": "c5c49245a962206d708b7c9368d9f1dd77c773250c0f7bdde9c78e994889cb19",
},
}
11 changes: 5 additions & 6 deletions third_party/repositories/scala_3_1.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ artifacts = {
"sha256": "b5f1d6071f1548d05be82f59f9039c7d37a1787bd8e3c677e31ee275af4a4621",
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.13.6",
"sha256": "bbfa4ab0603f510b16114371a35b9c34d20946edfc1aa8f3fd31014b9f06b5b1",
"artifact": "org.scala-lang:scalap:2.13.11",
"sha256": "ac358699f40002fb4f32ad77531765fce23425d0e83c51854d1635118ab285ea",
"deps": [
"@io_bazel_rules_scala_scala_compiler",
],
Expand Down Expand Up @@ -525,10 +525,9 @@ artifacts = {
"@org_springframework_spring_core",
],
},
# TODO: fix misleading artifact group in id
"org_spire_math_kind_projector": {
"org_typelevel_kind_projector": {
"testonly": True,
"artifact": "org.typelevel:kind-projector_2.13:0.10.3",
"sha256": "b5d60c8bc8f1333e2deac17d72d41bb59c53283a67ff3a613189746ce97ac8ad",
"artifact": "org.typelevel:kind-projector_2.13.11:0.13.2",
"sha256": "c5c49245a962206d708b7c9368d9f1dd77c773250c0f7bdde9c78e994889cb19",
},
}
11 changes: 5 additions & 6 deletions third_party/repositories/scala_3_2.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ artifacts = {
"sha256": "b5f1d6071f1548d05be82f59f9039c7d37a1787bd8e3c677e31ee275af4a4621",
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.13.6",
"sha256": "bbfa4ab0603f510b16114371a35b9c34d20946edfc1aa8f3fd31014b9f06b5b1",
"artifact": "org.scala-lang:scalap:2.13.11",
"sha256": "ac358699f40002fb4f32ad77531765fce23425d0e83c51854d1635118ab285ea",
"deps": [
"@io_bazel_rules_scala_scala_compiler",
],
Expand Down Expand Up @@ -525,10 +525,9 @@ artifacts = {
"@org_springframework_spring_core",
],
},
# TODO: fix misleading artifact group in id
"org_spire_math_kind_projector": {
"org_typelevel_kind_projector": {
"testonly": True,
"artifact": "org.typelevel:kind-projector_2.13:0.10.3",
"sha256": "b5d60c8bc8f1333e2deac17d72d41bb59c53283a67ff3a613189746ce97ac8ad",
"artifact": "org.typelevel:kind-projector_2.13.11:0.13.2",
"sha256": "c5c49245a962206d708b7c9368d9f1dd77c773250c0f7bdde9c78e994889cb19",
},
}
11 changes: 5 additions & 6 deletions third_party/repositories/scala_3_3.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ artifacts = {
"sha256": "b5f1d6071f1548d05be82f59f9039c7d37a1787bd8e3c677e31ee275af4a4621",
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.13.6",
"sha256": "bbfa4ab0603f510b16114371a35b9c34d20946edfc1aa8f3fd31014b9f06b5b1",
"artifact": "org.scala-lang:scalap:2.13.11",
"sha256": "ac358699f40002fb4f32ad77531765fce23425d0e83c51854d1635118ab285ea",
"deps": [
"@io_bazel_rules_scala_scala_compiler",
],
Expand Down Expand Up @@ -523,10 +523,9 @@ artifacts = {
"@org_springframework_spring_core",
],
},
# TODO: fix misleading artifact group in id
"org_spire_math_kind_projector": {
"org_typelevel_kind_projector": {
"testonly": True,
"artifact": "org.typelevel:kind-projector_2.13:0.10.3",
"sha256": "b5d60c8bc8f1333e2deac17d72d41bb59c53283a67ff3a613189746ce97ac8ad",
"artifact": "org.typelevel:kind-projector_2.13.11:0.13.2",
"sha256": "c5c49245a962206d708b7c9368d9f1dd77c773250c0f7bdde9c78e994889cb19",
},
}