Skip to content

Commit 39fa1a7

Browse files
authored
scala: finish upgrade of 2.12 to .20 (#1024)
1 parent 1a75416 commit 39fa1a7

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
distribution: temurin
3232
cache: sbt
3333
- uses: sbt/setup-sbt@v1
34-
- run: sbt '++2.12.19; docs/mdoc'
34+
- run: sbt '++2.12.20; docs/mdoc'
3535
test-windows:
3636
name: "Windows"
3737
runs-on: windows-latest
@@ -95,7 +95,7 @@ jobs:
9595
command:
9696
# Test legacy Scala versions, where reporting API changed
9797
- "'++2.12.12! testAllNonNative'" # compiler version too old for Scala Native
98-
- "'++2.12.19 test'"
98+
- "'++2.12.20 test'"
9999
- "'++2.13.17 test'"
100100
# Minimal supported version
101101
- "'++3.3.6 test'"

.github/workflows/mdoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
distribution: temurin
2020
- uses: sbt/setup-sbt@v1
2121
- uses: olafurpg/setup-gpg@v3
22-
- run: sbt '++2.12.19; docs/docusaurusPublishGhpages'
22+
- run: sbt '++2.12.20; docs/docusaurusPublishGhpages'
2323
env:
2424
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
2525
- name: Check git diff

.mergify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ pull_request_rules:
66
- check-success=Website
77
- check-success=Windows
88
- check-success="'++2.12.12! testAllNonNative' 11"
9-
- check-success="'++2.12.19 test' 11"
9+
- check-success="'++2.12.20 test' 11"
1010
- check-success="'++2.13.17 test' 11"
1111
- check-success="'++3.3.6 test' 11"
1212
- check-success="scripted 11"
1313
- check-success="'++2.12.12! testAllNonNative' 17"
14-
- check-success="'++2.12.19 test' 17"
14+
- check-success="'++2.12.20 test' 17"
1515
- check-success="'++2.13.17 test' 17"
1616
- check-success="'++3.3.6 test' 17"
1717
- check-success="scripted 17"

mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
> ++2.12.19 mdoc
1+
> ++2.12.20 mdoc
22
> check
33
> ++2.13.17 mdoc
44
> check

mdoc/src/main/scala/mdoc/internal/modifiers/ScastieModifier.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ScastieModifier(theme: String = "light", debugClassSuffix: Option[String]
6868
s" theme: '$theme',",
6969
" isWorksheetMode: true,",
7070
" targetType: 'jvm',",
71-
" scalaVersion: '2.12.6'",
71+
" scalaVersion: '2.12.20'",
7272
" })"
7373
).mkString("\n")
7474

tests/unit/src/test/scala/tests/markdown/ScastieModifierSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ScastieModifierSuite extends BaseMarkdownSuite {
4545
| theme: 'light',
4646
| isWorksheetMode: true,
4747
| targetType: 'jvm',
48-
| scalaVersion: '2.12.6'
48+
| scalaVersion: '2.12.20'
4949
| })
5050
|})</script>
5151
""".stripMargin
@@ -67,7 +67,7 @@ class ScastieModifierSuite extends BaseMarkdownSuite {
6767
| theme: 'dark',
6868
| isWorksheetMode: true,
6969
| targetType: 'jvm',
70-
| scalaVersion: '2.12.6'
70+
| scalaVersion: '2.12.20'
7171
| })
7272
|})</script>
7373
""".stripMargin,

website.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ Next
99

1010
1. Switch to the "website" folder. run `npm install`
1111
2. Copy the blog folder into the `website` folder (don't commit that)
12-
3. Back in the project root, run `sbt '++2.12.19; docs/mdoc'` in a terminal - this will run mdoc.
12+
3. Back in the project root, run `sbt '++2.12.20; docs/mdoc'` in a terminal - this will run mdoc.
1313
4. probably in a new terminal in the "website" folder , run `npm start`
1414

0 commit comments

Comments
 (0)