Merge pull request #148 from Sciss/work

Sciss · web-flow · commit 5f7373ff2291 · 2021-02-18T14:59:57.000+01:00
bump sbt and sbt plug-ins. move to Scala 3.0.0-RC1
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ scala:
   - 2.11.12
   - 2.12.11
   - 2.13.3
-  - 3.0.0-M2
+  - 3.0.0-RC1
 
 env:
   - ADOPTOPENJDK=8
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-lazy val scalaTestVersion = "3.2.3"
+lazy val scalaTestVersion = "3.2.4"
 
 lazy val commonSettings = Seq(
   scalacOptions     ++= Seq("-deprecation", "-feature"),
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.4
+sbt.version=1.4.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.3")
-addSbtPlugin("ch.epfl.lamp"           % "sbt-dotty"        % "0.4.6")  // cross-compile for dotty
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
+addSbtPlugin("ch.epfl.lamp"           % "sbt-dotty"        % "0.5.3")  // cross-compile for dotty

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-lazy val scalaTestVersion = "3.2.3"`
	`1`	`+lazy val scalaTestVersion = "3.2.4"`
`2`	`2`
`3`	`3`	`lazy val commonSettings = Seq(`
`4`	`4`	`scalacOptions ++= Seq("-deprecation", "-feature"),`