Merge pull request #182 from 2m/wip-sbt-0.13.16-RC1-2m

Update to sbt 0.13.16-RC1
lightbend-labs · Jul 24, 2017 · eb766ff · eb766ff
2 parents 73112c5 + b2088cc
commit eb766ff
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -24,7 +24,6 @@ object BuildSettings {
 
   val commonSettings = Defaults.coreDefaultSettings ++ Seq (
       organization := buildOrganization,
-      scalaVersion := sys.props.getOrElse("mima.buildScalaVersion", "2.10.6"),
       scalaVersion := sys.props.getOrElse("mima.buildScalaVersion",
         (CrossVersion partialVersion (sbtVersion in pluginCrossBuild).value match {
           case Some((0, 13)) => "2.10.6"
@@ -98,7 +97,7 @@ object MimaBuild {
     settings(name := buildName,
              publish := (),
              publishLocal := (),
-             crossSbtVersions := List("0.13.16-M1", "1.0.0-RC2"),
+             crossSbtVersions := List("0.13.16-RC1", "1.0.0-RC2"),
              testScalaVersion in Global :=  sys.props.getOrElse("mima.testScalaVersion", scalaVersion.value)
     )
     enablePlugins(GitVersioning)
@@ -161,22 +160,6 @@ object MimaBuild {
     settings(sbtPublishSettings:_*)
   )
 
-  // WORKAROUND https://github.com/sbt/sbt/issues/3325
-  def scriptedSettings = Def settings (
-    ScriptedPlugin.scriptedSettings filterNot (_.key.key.label == libraryDependencies.key.label),
-    libraryDependencies ++= {
-      val cross = CrossVersion.partialVersion(scriptedSbt.value) match {
-        case Some((0, 13)) => CrossVersion.Disabled
-        case Some((1, _))  => CrossVersion.binary
-        case _             => sys error s"Unhandled sbt version ${scriptedSbt.value}"
-      }
-      Seq(
-        "org.scala-sbt" % "scripted-sbt" % scriptedSbt.value % scriptedConf.toString cross cross,
-        "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % scriptedLaunchConf.toString
-      )
-    }
-  )
-
   lazy val reporterFunctionalTests = project("reporter-functional-tests",
   										file("reporter") / "functional-tests" ,
   										settings = commonSettings)

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16-M1
+sbt.version=0.13.16-RC1
diff --git a/sbtplugin/src/main/scala-sbt-0.13/compat.scala b/sbtplugin/src/main/scala-sbt-0.13/compat.scala
@@ -6,10 +6,6 @@ package sbt
 
 object compat {
   val scalaModuleInfo = SettingKey[Option[librarymanagement.ScalaModuleInfo]]("ivyScala")
-
-  implicit class ModuleIdOps(val _m: ModuleID) extends AnyVal {
-    def withName(n: String): ModuleID = _m copy (name = n)
-  }
 }
 
 package librarymanagement {