luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatically add maven-plugin to classpathTypes for sbt plugins (#28)

This commit is contained in:
Alexandre Archambault 2019-01-16 17:03:17 +01:00 committed by GitHub
parent c8e18af3ef
commit 8d568af4d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala
View File

@ -44,9 +44,13 @@ object CoursierPlugin extends AutoPlugin {
@deprecated("Use sbtCoursierVersion instead", "1.1.0-M9")
val coursierVersion = sbtCoursierVersion
val addSbtCoursier = {
val addSbtCoursier: Seq[Def.Setting[_]] = {
import sbt._
addSbtPlugin("io.get-coursier" % "sbt-coursier" % sbtCoursierVersion)
Seq(
addSbtPlugin("io.get-coursier" % "sbt-coursier" % sbtCoursierVersion),
// seems needed for some sbt plugins (https://github.com/coursier/coursier/issues/450)
classpathTypes += "maven-plugin"
)
}
}

18
modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/build.sbt Normal file
View File

@ -0,0 +1,18 @@
scalaVersion := "2.12.8"
enablePlugins(JavaAppPackaging)
lazy val check = taskKey[Unit]("")
check := {
val cmd = "target/universal/stage/bin/maven-plugin-classpath-type"
val cmd0 =
if (sys.props("os.name").toLowerCase(java.util.Locale.ROOT).contains("windows"))
cmd + ".bat"
else
cmd
val b = new ProcessBuilder(cmd0)
b.inheritIO()
val p = b.start()
val retCode = p.waitFor()
assert(retCode == 0, s"Command $cmd returned code $retCode")
}

2
modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt Normal file
View File

@ -0,0 +1,2 @@
addSbtCoursier
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.3")

13
modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/project/plugins.sbt Normal file
View File

@ -0,0 +1,13 @@
addSbtPlugin {
val name = sys.props.getOrElse(
"plugin.name",
sys.error("plugin.name Java property not set")
)
val version = sys.props.getOrElse(
"plugin.version",
sys.error("plugin.version Java property not set")
)
"io.get-coursier" % name % version
}

6
modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/src/main/scala/Main.scala Normal file
View File

@ -0,0 +1,6 @@
import java.io.File
import java.nio.file.Files
object Main extends App {
Files.write(new File("output").toPath, "OK".getBytes("UTF-8"))
}

5
modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/test Normal file
View File

@ -0,0 +1,5 @@
$ delete output
> stage
> check
$ exists output
$ delete output

10
modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala
View File

@ -7,7 +7,7 @@ import coursier.sbtcoursiershared.SbtCoursierShared
import sbt.{AutoPlugin, Classpaths, Def, Setting, Task, taskKey}
import sbt.Project.inTask
import sbt.KeyRanks.DTask
import sbt.Keys.{appConfiguration, autoScalaLibrary, dependencyResolution, excludeDependencies, scalaBinaryVersion, scalaOrganization, scalaVersion, streams, updateClassifiers, updateSbtClassifiers}
import sbt.Keys.{appConfiguration, autoScalaLibrary, classpathTypes, dependencyResolution, excludeDependencies, scalaBinaryVersion, scalaOrganization, scalaVersion, streams, updateClassifiers, updateSbtClassifiers}
import sbt.librarymanagement.DependencyResolution
object LmCoursierPlugin extends AutoPlugin {
@ -17,9 +17,13 @@ object LmCoursierPlugin extends AutoPlugin {
object autoImport {
val coursierConfiguration = taskKey[CoursierConfiguration]("General dependency management (Coursier) settings, such as the resolvers and options to use.").withRank(DTask)
val addSbtCoursier = {
val addSbtCoursier: Seq[Def.Setting[_]] = {
import sbt._
addSbtPlugin("io.get-coursier" % "sbt-lm-coursier" % sbtCoursierVersion)
Seq(
addSbtPlugin("io.get-coursier" % "sbt-lm-coursier" % sbtCoursierVersion),
// seems needed for some sbt plugins (https://github.com/coursier/coursier/issues/450)
classpathTypes += "maven-plugin"
)
}
}