--- a/build.sbt Tue Jun 20 21:59:54 2017 +0200
+++ b/build.sbt Thu Dec 14 09:13:30 2017 +0100
@@ -1,8 +1,11 @@
-import sbt.Project.project
+import scala.sys.process._
-lazy val root = project.in(file(".")).
+val scalaVersions = Seq("2.11.12", "2.12.4")
+
+lazy val fatagsRoot = project.in(file(".")).
aggregate(fatagsJS, fatagsJVM).
settings(
+ crossScalaVersions := scalaVersions,
publish := {},
publishLocal := {}
)
@@ -10,7 +13,15 @@
lazy val buildSettings = Seq(
organization := "net.tz",
name := "faTags",
- scalaVersion := "2.11.11",
+ scalaVersion := "2.12.4",
+ crossScalaVersions := scalaVersions,
+ 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,14 +30,14 @@
settings(buildSettings:_*).
settings(
libraryDependencies ++= Seq(
- "com.lihaoyi" %%% "scalatags" % "0.6.3"
+ "com.lihaoyi" %%% "scalatags" % "0.6.7"
),
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion,
"scalaJSVersion" -> scalaJSVersion,
BuildInfoKey.action("buildTime") { System.currentTimeMillis },
- BuildInfoKey.action("hgId") { Process("hg id -i").lines.head },
- BuildInfoKey.action("hgTags") { Process("hg id -t").lines.head }
+ BuildInfoKey.action("hgId") { "hg id -i".!!.trim },
+ BuildInfoKey.action("hgTags") { "hg id -t".!!.trim }
),
buildInfoPackage := "fatags",
buildInfoOptions ++= Seq(BuildInfoOption.ToMap, BuildInfoOption.ToJson)
--- a/project/build.properties Tue Jun 20 21:59:54 2017 +0200
+++ b/project/build.properties Thu Dec 14 09:13:30 2017 +0100
@@ -1,1 +1,1 @@
-sbt.version=0.13.15
+sbt.version=1.0.4
--- a/project/plugins.sbt Tue Jun 20 21:59:54 2017 +0200
+++ b/project/plugins.sbt Thu Dec 14 09:13:30 2017 +0100
@@ -5,8 +5,8 @@
url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
// Sbt plugins
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.17")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
-addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
--- a/version.sbt Tue Jun 20 21:59:54 2017 +0200
+++ b/version.sbt Thu Dec 14 09:13:30 2017 +0100
@@ -1,1 +1,1 @@
-version in ThisBuild := "0.1"
+version in ThisBuild := "0.2-SNAPSHOT"