diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2017-03-14 15:07:21 +0100 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2017-03-24 17:51:24 +0100 |
| commit | 84cf02c249891d02b1eb38981b7df4ae9377e6e4 (patch) | |
| tree | 5c7451d9a43652f26c22461b4b0ff5eaf511261f /project | |
| parent | 5fd7a9503e44b8e95c0ca5aa4366270a3cd90155 (diff) | |
| download | dotty-84cf02c249891d02b1eb38981b7df4ae9377e6e4.tar.gz dotty-84cf02c249891d02b1eb38981b7df4ae9377e6e4.tar.bz2 dotty-84cf02c249891d02b1eb38981b7df4ae9377e6e4.zip | |
Upgrade to sbt 0.13.14-RC2
Also replace com.typesafe.sbt:sbt-interface by the equivalent
org.scala-sbt:interface since the former is not published in 0.13.14 for
some reason (https://github.com/sbt/sbt/issues/3012).
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 13 | ||||
| -rw-r--r-- | project/build.properties | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/project/Build.scala b/project/Build.scala index f702e3563..10a397678 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -281,8 +281,11 @@ object DottyBuild extends Build { libraryDependencies ++= partestDeps.value, libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-xml" % "1.0.1", "org.scala-lang.modules" %% "scala-partest" % "1.0.11" % "test", - "com.novocode" % "junit-interface" % "0.11" % "test", - "com.typesafe.sbt" % "sbt-interface" % sbtVersion.value), + "com.novocode" % "junit-interface" % "0.11" % "test"), + + resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt:interface + libraryDependencies += "org.scala-sbt" % "interface" % sbtVersion.value, + // enable improved incremental compilation algorithm incOptions := incOptions.value.withNameHashing(true), @@ -428,7 +431,7 @@ object DottyBuild extends Build { // FIXME: should go away when xml literal parsing is removed path.contains("scala-xml") || // needed for the xsbti interface - path.contains("sbt-interface") + path.contains("org.scala-sbt/interface/") } yield "-Xbootclasspath/p:" + path val ci_build = // propagate if this is a ci build @@ -552,9 +555,9 @@ object DottyBuild extends Build { }, publishLocal := (publishLocal.dependsOn(cleanSbtBridge)).value, description := "sbt compiler bridge for Dotty", - resolvers += Resolver.typesafeIvyRepo("releases"), + resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt stuff libraryDependencies ++= Seq( - "com.typesafe.sbt" % "sbt-interface" % sbtVersion.value, + "org.scala-sbt" % "interface" % sbtVersion.value, "org.scala-sbt" % "api" % sbtVersion.value % "test", "org.specs2" %% "specs2" % "2.3.11" % "test" ), diff --git a/project/build.properties b/project/build.properties index 43b8278c6..866eb2660 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.11 +sbt.version=0.13.14-RC2 |