Skip to content

Upgrade to 3.0.0-M3 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2020
Merged

Upgrade to 3.0.0-M3 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ project/boot/
project/plugins/project/
project/local-plugins.sbt
.history
.bsp

# Scala-IDE specific
.scala_dependencies
Expand Down
10 changes: 5 additions & 5 deletions src/main/g8/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
)
2 changes: 1 addition & 1 deletion src/main/g8/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.13
sbt.version=1.4.4
2 changes: 1 addition & 1 deletion src/main/g8/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.0")