Skip to content

Commit ab22d66

Browse files
committed
Bump to Scala 3.0.0-M3
1 parent 985be34 commit ab22d66

File tree

4 files changed

+10
-27
lines changed

4 files changed

+10
-27
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: olafurpg/setup-scala@v10
1616
- name: Test Incompatibilities 3.0
17-
run: sbt '++3.0.0-M1; incompat-30 / test; ++2.13.4; incompat-30 / test'
17+
run: sbt '++3.0.0-M3; incompat-30 / test; ++2.13.4; incompat-30 / test'
1818
- name: Test Incompatibilities 3.1
1919
run: sbt 'incompat-31 / test'
2020
macro:
@@ -26,9 +26,9 @@ jobs:
2626
- uses: actions/checkout@v2
2727
- uses: olafurpg/setup-scala@v10
2828
- name: Test Cross Compilation
29-
run: sbt '++3.0.0-M1; macro-cross-app / run; ++2.13.4; macro-cross-app / run'
29+
run: sbt '++3.0.0-M3; macro-cross-app / run; ++2.13.4; macro-cross-app / run'
3030
- name: Test Mixing Definitions
31-
run: sbt '++3.0.0-M1; macro-mix-app / run; ++2.13.4; macro-mix-app / run'
31+
run: sbt '++3.0.0-M3; macro-mix-app / run; ++2.13.4; macro-mix-app / run'
3232
sbt-migration:
3333
name: Test sbt Migration
3434
runs-on: ubuntu-latest
@@ -38,4 +38,4 @@ jobs:
3838
- uses: actions/checkout@v2
3939
- uses: olafurpg/setup-scala@v10
4040
- name: Test Cross Compilation
41-
run: sbt '++0.27.0-RC1; sbt-migration-tutorial / run; ++2.13.3; sbt-migration-tutorial / run'
41+
run: sbt '++3.0.0-M3; sbt-migration-tutorial / run; ++2.13.4; sbt-migration-tutorial / run'

project/Versions.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
object Versions {
22
val scala213 = "2.13.4"
3-
val scala30 = "3.0.0-M1"
4-
val dotty = "0.27.0-RC1"
5-
val `scala-2.13.3` = "2.13.3"
6-
val sbtDotty = "0.4.6"
7-
val osLib = "0.7.1"
8-
val sourcecode = "0.2.1"
3+
val scala30 = "3.0.0-M3"
4+
val sbtDotty = "0.4.7"
5+
val osLib = "0.7.2"
6+
val sourcecode = "0.2.3"
97
}

sbt-migration-tutorial.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Versions._
33
lazy val `sbt-migration-tutorial` = project
44
.in(file("sbt-migration-tutorial"))
55
.settings(
6-
scalaVersion := dotty,
7-
crossScalaVersions := Seq(scala213, dotty),
6+
scalaVersion := scala30,
7+
crossScalaVersions := Seq(scala213, scala30),
88
libraryDependencies ++= Seq(
99
"org.typelevel" % "cats-core_2.13" % "2.1.1",
1010
"com.lihaoyi" %% "os-lib" % osLib, // TODO use "os-lib_3.0"

website/i18n/en.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,9 @@
1111
"contributing": {
1212
"title": "Contributing"
1313
},
14-
"cross-build": {
15-
"title": "Cross-building"
16-
},
17-
"dotty-rewrites": {
18-
"title": "Dotty Migration Mode"
19-
},
2014
"external-resources/moving-from-scala-2-to-scala-3": {
2115
"title": "Moving from Scala 2 to Scala 3"
2216
},
23-
"get-started": {
24-
"title": "Introduction"
25-
},
2617
"incompat-31": {
2718
"title": "Dotty 3.1-migration Mode"
2819
},
@@ -41,9 +32,6 @@
4132
"incompatibilities/table": {
4233
"title": "Incompatibility Table"
4334
},
44-
"macros": {
45-
"title": "Macros Migration"
46-
},
4735
"macros/macro-libraries": {
4836
"title": "Scala Macro Libraries"
4937
},
@@ -67,9 +55,6 @@
6755
},
6856
"tutorials/scalacoptions-migration": {
6957
"title": "Porting the scalacOptions"
70-
},
71-
"upgrade": {
72-
"title": "Upgrading a Scala Application"
7358
}
7459
},
7560
"links": {

0 commit comments

Comments
 (0)