# HG changeset patch # User Tomas Zeman # Date 1511802335 -3600 # Node ID 32b2c532065761c1e73d5c0b850678b087f6b6e1 # Parent 1c61329ae07a92a0628f90e068fa23fd53979637 cross build against scala 2.11 + 2.12 diff -r 1c61329ae07a -r 32b2c5320657 build.sbt --- a/build.sbt Tue Nov 21 15:57:25 2017 +0100 +++ b/build.sbt Mon Nov 27 18:05:35 2017 +0100 @@ -1,6 +1,8 @@ import sbt.Project.project -lazy val root = project.in(file(".")). +crossScalaVersions := Seq("2.11.12", "2.12.4") + +lazy val ngtagsRoot = project.in(file(".")). aggregate(ngtagsJS, ngtagsJVM, radarChart). settings( publish := {}, @@ -10,7 +12,14 @@ lazy val buildSettings = Seq( organization := "net.tz", name := "ngTags", - scalaVersion := "2.11.8", + scalaVersion := "2.11.12", + scalacOptions ++= Seq( + "-feature", "-deprecation", "-unchecked", + "-language:implicitConversions", "-language:reflectiveCalls", + "-language:postfixOps" + ), + javacOptions ++= Seq( + "-encoding", "UTF-8", "-Xlint:deprecation", "-Xlint:unchecked"), licenses += ("Apache-2.0", url("http://opensource.org/licenses/Apache-2.0")) ) @@ -19,7 +28,7 @@ settings(buildSettings:_*). settings( libraryDependencies ++= Seq( - "com.lihaoyi" %%% "scalatags" % "0.6.0" + "com.lihaoyi" %%% "scalatags" % "0.6.7" //"com.github.japgolly.scalacss" %%% "ext-scalatags" % "0.1.0" ), diff -r 1c61329ae07a -r 32b2c5320657 project/build.properties --- a/project/build.properties Tue Nov 21 15:57:25 2017 +0100 +++ b/project/build.properties Mon Nov 27 18:05:35 2017 +0100 @@ -1,1 +1,1 @@ -sbt.version=0.13.11 +sbt.version=0.13.16 diff -r 1c61329ae07a -r 32b2c5320657 project/plugins.sbt --- a/project/plugins.sbt Tue Nov 21 15:57:25 2017 +0100 +++ b/project/plugins.sbt Mon Nov 27 18:05:35 2017 +0100 @@ -5,7 +5,7 @@ url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns) // Sbt plugins -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.5.0")