From f59a6c44c3d4fb4492e382bbe41efbc6d939defe Mon Sep 17 00:00:00 2001 From: Lars Hupel Date: Fri, 21 Oct 2016 21:50:49 +0200 Subject: [PATCH] dependency updates in preparation for Scala 2.12.x --- build.sbt | 11 +++-------- project/plugins.sbt | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index 7df37f01a..23bddc526 100644 --- a/build.sbt +++ b/build.sbt @@ -74,11 +74,6 @@ lazy val scalaVersionAgnosticCommonSettings = Seq( "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases", Resolver.sonatypeRepo("releases") ), - scalacOptions += "-target:jvm-1.7", - javacOptions ++= Seq( - "-source", "1.7", - "-target", "1.7" - ), javacOptions in Keys.doc := Seq() ) ++ releaseSettings @@ -87,7 +82,7 @@ lazy val commonSettings = scalaVersionAgnosticCommonSettings ++ Seq( crossScalaVersions := Seq("2.11.8", "2.10.6"), libraryDependencies ++= { if (scalaBinaryVersion.value == "2.10") - Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full)) + Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)) else Seq() } @@ -102,7 +97,7 @@ lazy val core = crossProject name := "coursier", libraryDependencies ++= Seq( "org.scalaz" %%% "scalaz-core" % scalazVersion, - "com.lihaoyi" %%% "fastparse" % "0.3.7" + "com.lihaoyi" %%% "fastparse" % "0.4.1" ), resourceGenerators.in(Compile) += { (target, version).map { (dir, ver) => @@ -236,7 +231,7 @@ lazy val tests = crossProject name := "coursier-tests", libraryDependencies ++= Seq( "org.scala-lang.modules" %% "scala-async" % "0.9.5" % "provided", - "com.lihaoyi" %%% "utest" % "0.4.3" % "test" + "com.lihaoyi" %%% "utest" % "0.4.4" % "test" ), unmanagedResourceDirectories in Test += (baseDirectory in LocalRootProject).value / "tests" / "shared" / "src" / "test" / "resources", testFrameworks += new TestFramework("utest.runner.Framework") diff --git a/project/plugins.sbt b/project/plugins.sbt index b5d5bb769..7e32d92a5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.11") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.1.0") -addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.2") +addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.5") addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14") addSbtPlugin("com.typesafe.sbt" % "sbt-proguard" % "0.2.2") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.9")