Skip to content

Commit 5289991

Browse files
authored
scala 2.12.10 is default version, closes #703 (#1054)
* scala 2.12.10 is default version, closes #703 * specs2 matcher to try catch * default 2.12.11 (latest) * update golden coverage file
1 parent fb6e0f0 commit 5289991

File tree

5 files changed

+60
-262
lines changed

5 files changed

+60
-262
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,18 @@ Please check [coverage.md](docs/coverage.md) for more details on coverage suppor
126126
Rules scala supports the last two released minor versions for each of Scala 2.11 and 2.12.
127127
Previous minor versions may work but are supported only on a best effort basis.
128128

129-
By default `Scala 2.11.12` is used and to use another version you need to
129+
By default `Scala 2.12.10` is used and to use another version you need to
130130
specify it when calling `scala_repositories`. `scala_repositories` takes a tuple `(scala_version, scala_version_jar_shas)`
131131
as a parameter where `scala_version` is the scala version and `scala_version_jar_shas` is a `dict` with
132132
`sha256` hashes for the maven artifacts `scala_compiler`, `scala_library`, and `scala_reflect`:
133133

134134
```python
135135
scala_repositories((
136-
"2.12.10",
136+
"2.11.12",
137137
{
138-
"scala_compiler": "cedc3b9c39d215a9a3ffc0cc75a1d784b51e9edc7f13051a1b4ad5ae22cfbc0c",
139-
"scala_library": "0a57044d10895f8d3dd66ad4286891f607169d948845ac51e17b4c1cf0ab569d",
140-
"scala_reflect": "56b609e1bab9144fb51525bfa01ccd72028154fc40a58685a1e9adcbe7835730"
138+
"scala_compiler": "3e892546b72ab547cb77de4d840bcfd05c853e73390fed7370a8f19acb0735a0",
139+
"scala_library": "0b3d6fd42958ee98715ba2ec5fe221f4ca1e694d7c981b0ae0cd68e97baf6dce",
140+
"scala_reflect": "6ba385b450a6311a15c918cf8688b9af9327c6104f0ecbd35933cfcd3095fe04",
141141
}
142142
))
143143
```

WORKSPACE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jvm_maven_import_external(
6363
"com.twitter:scalding-date:0.17.0",
6464
default_scala_major_version(),
6565
),
66-
artifact_sha256 = "bf743cd6d224a4568d6486a2b794143e23145d2afd7a1d2de412d49e45bdb308",
66+
artifact_sha256 = "973a7198121cc8dac9eeb3f325c93c497fe3b682f68ba56e34c1b210af7b15b3",
6767
server_urls = MAVEN_SERVER_URLS,
6868
)
6969

@@ -74,18 +74,18 @@ jvm_maven_import_external(
7474
"org.typelevel:cats-core:0.9.0",
7575
default_scala_major_version(),
7676
),
77-
artifact_sha256 = "3fda7a27114b0d178107ace5c2cf04e91e9951810690421768e65038999ffca5",
77+
artifact_sha256 = "3ca705cba9dc0632e60477d80779006f8c636c0e2e229dda3410a0c314c1ea1d",
7878
server_urls = MAVEN_SERVER_URLS,
7979
)
8080

8181
# test of a plugin
8282
jvm_maven_import_external(
8383
name = "org_psywerx_hairyfotr__linter",
8484
artifact = scala_mvn_artifact(
85-
"org.psywerx.hairyfotr:linter:0.1.13",
85+
"org.psywerx.hairyfotr:linter:0.1.17",
8686
default_scala_major_version(),
8787
),
88-
artifact_sha256 = "9444dd78684c0cc89d070af0f5ca3f3ae7d56b2a4d7ac1c038f8218ad4d66fad",
88+
artifact_sha256 = "59becd7883613064842b3a62f84315b02457dc439f42ef62e3c80408393c905b",
8989
server_urls = MAVEN_SERVER_URLS,
9090
)
9191

@@ -243,7 +243,7 @@ scala_maven_import_external(
243243
"org.spire-math:kind-projector:0.9.10",
244244
default_scala_major_version(),
245245
),
246-
artifact_sha256 = "897460d4488b7dd6ac9198937d6417b36cc6ec8ab3693fdf2c532652f26c4373",
246+
artifact_sha256 = "36aca2493302e2c037328107a121cda1d28bf9119fbc04fb47ea1ff9bce3c03f",
247247
fetch_sources = False,
248248
licenses = ["notice"],
249249
server_urls = MAVEN_SERVER_URLS,

scala/scala_cross_version.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ resolution."""
2222

2323
def default_scala_version():
2424
"""return the scala version for use in maven coordinates"""
25-
return "2.11.12"
25+
return "2.12.11"
2626

2727
def default_scala_version_jar_shas():
2828
return {
29-
"scala_compiler": "3e892546b72ab547cb77de4d840bcfd05c853e73390fed7370a8f19acb0735a0",
30-
"scala_library": "0b3d6fd42958ee98715ba2ec5fe221f4ca1e694d7c981b0ae0cd68e97baf6dce",
31-
"scala_reflect": "6ba385b450a6311a15c918cf8688b9af9327c6104f0ecbd35933cfcd3095fe04",
29+
"scala_compiler": "e901937dbeeae1715b231a7cfcd547a10d5bbf0dfb9d52d2886eae18b4d62ab6",
30+
"scala_library": "dbfe77a3fc7a16c0c7cb6cb2b91fecec5438f2803112a744cb1b187926a138be",
31+
"scala_reflect": "5f9e156aeba45ef2c4d24b303405db259082739015190b3b334811843bd90d6a",
3232
}
3333

3434
def default_maven_server_urls():

0 commit comments

Comments
 (0)