Skip to content

Commit

Permalink
add Scala 3.0.0-RC1 to crossbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue committed Feb 17, 2021
1 parent c0747c9 commit 24afdce
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Expand Up @@ -47,6 +47,12 @@ jobs:
- SCALA_VERSION=3.0.0-M3
- TRAVIS_JDK=8

- name: "Run tests with Scala 3 and AdoptOpenJDK 8"
script: scripts/test-code.sh
env:
- SCALA_VERSION=3.0.0-RC1
- TRAVIS_JDK=8

- stage: publish
name: "Publish artifacts to Bintray"
script: sbt +publish
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Expand Up @@ -123,7 +123,7 @@ lazy val commonSettings = Def.settings(
),
headerLicense := Some(HeaderLicense.Custom(s"Copyright (C) 2009-2021 Lightbend Inc. <https://www.lightbend.com>")),
scalaVersion := Dependencies.Scala212,
crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213, Dependencies.Scala3),
crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213) ++ Dependencies.Scala3,
javacOptions in Compile ++= javacSettings,
javacOptions in Test ++= javacSettings,
javacOptions in (Compile, compile) ++= Seq("-target", "1.8"), // sbt #1785, avoids passing to javadoc
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Expand Up @@ -2,5 +2,5 @@ object Dependencies {
// scalaVersion needs to be kept in sync with travis-ci
val Scala212 = "2.12.13"
val Scala213 = "2.13.4"
val Scala3 = "3.0.0-M3"
val Scala3 = Seq("3.0.0-M3", "3.0.0-RC1")
}
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=1.4.6
sbt.version=1.4.7
4 changes: 2 additions & 2 deletions project/plugins.sbt
Expand Up @@ -15,12 +15,12 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")

addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")

addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")

addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.1")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")

0 comments on commit 24afdce

Please sign in to comment.