Skip to content

Commit

Permalink
Merge pull request #103 from xuwei-k/sbt-3325
Browse files Browse the repository at this point in the history
remove sbt issue 3325 workaround
  • Loading branch information
dwijnand committed Jul 31, 2017
2 parents 2a53f93 + 5cc63c2 commit 22457be
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions build.sbt
Expand Up @@ -54,19 +54,3 @@ lazy val plugin = (project in file("plugin")).
publishLocal := (publishLocal dependsOn (publishLocal in library)).value
).
dependsOn(library)

// 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
)
}
)

0 comments on commit 22457be

Please sign in to comment.