Skip to content

Commit 3235060

Browse files
smarternicolasstucki
authored andcommitted
Upgrade to 3.0.0-M3
1 parent 774963b commit 3235060

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ project/boot/
1212
project/plugins/project/
1313
project/local-plugins.sbt
1414
.history
15+
.bsp
1516

1617
# Scala-IDE specific
1718
.scala_dependencies

src/main/g8/build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
val dottyVersion = "3.0.0-M2"
2-
val scala213Version = "2.13.4"
1+
val scala2Version = "2.13.4"
2+
val scala3Version = "3.0.0-M3"
33

44
lazy val root = project
55
.in(file("."))
66
.settings(
7-
name := "dotty-cross",
7+
name := "scala3-cross",
88
version := "0.1.0",
99

1010
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
1111

1212
// To make the default compiler and REPL use Dotty
13-
scalaVersion := dottyVersion,
13+
scalaVersion := scala3Version,
1414

1515
// To cross compile with Dotty and Scala 2
16-
crossScalaVersions := Seq(dottyVersion, scala213Version)
16+
crossScalaVersions := Seq(scala3Version, scala2Version)
1717
)

src/main/g8/project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.13
1+
sbt.version=1.4.4

src/main/g8/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
1+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.0")

0 commit comments

Comments
 (0)