Merge pull request #40 from larsrh/topic/deps

Dependency updates

.travis.yml

@@ -1,5 +1,6 @@
 language: scala
 scala:
+- 2.12.0-M5
 - 2.11.8
 - 2.10.6
 jdk:

build.sbt

@@ -22,11 +22,10 @@ lazy val util = crossProject
   .settings(
     name := "case-app-util",
     libraryDependencies ++= Seq(
-      "com.chuusai" %%% "shapeless" % "2.3.1",
-      "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
-      "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
+      "com.chuusai" %%% "shapeless" % "2.3.2",
       "org.typelevel" %% "macro-compat" % "1.1.1",
-      compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
+      "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
+      "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
     )
   )
 
@@ -39,7 +38,7 @@ lazy val core = crossProject
   .settings(
     name := "case-app",
     libraryDependencies ++= Seq(
-      "org.scalatest" %%% "scalatest" % "3.0.0-M11" % "test"
+      "org.scalatest" %%% "scalatest" % "3.0.0" % "test"
     )
   )
 
@@ -60,6 +59,7 @@ lazy val doc = project
 lazy val commonSettings = Seq(
   organization := "com.github.alexarchambault",
   scalaVersion := "2.11.8",
+  crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0-M5"),
   resolvers ++= Seq(
     Resolver.sonatypeRepo("releases")
   ),
@@ -68,12 +68,7 @@ lazy val commonSettings = Seq(
     "-deprecation",
     "-target:jvm-1.6"
   ),
-  libraryDependencies ++= {
-    if (scalaVersion.value startsWith "2.10.")
-      Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full))
-    else
-      Seq()
-  }
+  libraryDependencies += compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
 ) ++ fullReleaseSettings
 
 lazy val fullReleaseSettings = Seq(

core/shared/src/test/scala/caseapp/HelpTests.scala

@@ -18,7 +18,7 @@ class HelpTests extends FlatSpec with Matchers {
         |  --foo  <value>
         |  --bar  <value>""".stripMargin
 
-    def lines(s: String) = s.linesIterator.toVector
+    def lines(s: String) = s.lines.toVector
 
     println((lines(message) zip lines(expectedMessage)).filter {
       case (a, b) =>
@@ -35,7 +35,7 @@ class HelpTests extends FlatSpec with Matchers {
       second: String
     )
 
-    val helpLines = Messages[Options].helpMessage.linesIterator.toVector
+    val helpLines = Messages[Options].helpMessage.lines.toVector
 
     helpLines.count(_.contains("--first")) shouldBe 1
     helpLines.count(_.contains("--second")) shouldBe 0

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.11

project/plugins.sbt

@@ -5,7 +5,7 @@ resolvers += Resolver.url(
 )
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
+addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.4")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")
 
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M11")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-3")