diff --git a/.gitignore b/.gitignore index c96da83..2f4ab06 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ project/boot/ project/plugins/project/ project/local-plugins.sbt .history +.bsp # Scala-IDE specific .scala_dependencies diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 4b647ad..2b3c422 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,17 +1,17 @@ -val dottyVersion = "3.0.0-M2" -val scala213Version = "2.13.4" +val scala2Version = "2.13.4" +val scala3Version = "3.0.0-M3" lazy val root = project .in(file(".")) .settings( - name := "dotty-cross", + name := "scala3-cross", version := "0.1.0", libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test", // To make the default compiler and REPL use Dotty - scalaVersion := dottyVersion, + scalaVersion := scala3Version, // To cross compile with Dotty and Scala 2 - crossScalaVersions := Seq(dottyVersion, scala213Version) + crossScalaVersions := Seq(scala3Version, scala2Version) ) diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index 0837f7a..7de0a93 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.4.4 diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt index 83a3da1..b12914f 100644 --- a/src/main/g8/project/plugins.sbt +++ b/src/main/g8/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6") +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.0")