Skip to content
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

Scala 2.13.0-RC1 #213

Merged
merged 6 commits into from
Apr 8, 2019
Merged

Scala 2.13.0-RC1 #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f6e327
Scala 2.13.0-RC1
marcospereira Apr 8, 2019
52fcf7b
Use Scala.js 0.6.27
marcospereira Apr 8, 2019
4a400bb
Run build for 2.13.0-RC1
marcospereira Apr 8, 2019
04fc708
Consistent use of Scala 2.12
marcospereira Apr 8, 2019
637ca3e
Fix the build
marcospereira Apr 8, 2019
f3ed1d2
Remove Scala 2.11 from travis configuration
marcospereira Apr 8, 2019
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: scala
scala:
- 2.12.8
- 2.11.12
- 2.10.7
- 2.13.0-RC1

env:
matrix:
Expand Down
14 changes: 5 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.scalajs.jsenv.nodejs.NodeJSEnv

val commonSettings = Seq(
scalaVersion := scala212,
crossScalaVersions := Seq(scala210, scala211, scala212, scala213, "2.13.0-M3")
crossScalaVersions := Seq(scala210, scala212, scala213)
)

lazy val twirl = project
Expand Down Expand Up @@ -68,6 +68,7 @@ lazy val plugin = project
.settings(
name := "sbt-twirl",
organization := "com.typesafe.sbt",
scalaVersion := scala212,
libraryDependencies += "org.scalatest" %%% "scalatest" % scalatest(scalaVersion.value) % "test",
resourceGenerators in Compile += generateVersionFile.taskValue,
scriptedDependencies := {
Expand Down Expand Up @@ -99,27 +100,22 @@ def generateVersionFile = Def.task {
// Dependencies

def scalatest(scalaV: String): String = scalaV match {
case "2.13.0-M3" => "3.0.5-M1"
case "2.13.0-M4" => "3.0.6-SNAP2"
case _ => "3.0.6-SNAP4"
case _ => "3.0.8-RC2"
}

def scalaCompiler(version: String) = "org.scala-lang" % "scala-compiler" % version

def scalaParserCombinators(scalaVersion: String): Seq[ModuleID] = scalaVersion match {
case interplay.ScalaVersions.scala210 => Seq.empty
case "2.13.0-M3" => Seq(
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.0" % "optional"
)
case _ => Seq(
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1" % "optional"
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2" % "optional"
)
}

def scalaXml = Def.setting {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((x, y)) if x > 2 || (x == 2 && y >= 11) =>
Seq("org.scala-lang.modules" %%% "scala-xml" % "1.1.0")
Seq("org.scala-lang.modules" %%% "scala-xml" % "1.2.0")
case _ =>
Seq.empty
}
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("2.0.5"))
addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("2.0.6"))

// For the Cross Build
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
2 changes: 1 addition & 1 deletion sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % sys.props("project.version"))

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")