Skip to content
Merged

sbt 2 #382

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- uses: sbt/setup-sbt@v1
- run: sbt -v test
- run: |
sbt -v publishLocal "project plugin" "^ scripted" &&
sbt -v publishLocal plugin2_12/scripted plugin3/scripted &&
java -jar ./target/scala-2.11/proguard/conscript-*.jar --version
push_gh_pages:
needs: [test, setup_script_unix, setup_script_windows]
Expand Down
20 changes: 14 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ lazy val commonSettings = Seq(
Seq("-language:_", "-Xlint", "-Xfuture")
}
},
crossSbtVersions := Seq("1.2.8")
)

lazy val root = (project in file(".")).
Expand Down Expand Up @@ -86,12 +85,12 @@ lazy val root = (project in file(".")).
inquireVersions,
runClean,
runTest,
releaseStepCommandAndRemaining(s"^ plugin/scripted"),
releaseStepCommandAndRemaining(s"plugin2_12/scripted ; plugin3/scripted "),
setReleaseVersion,
releaseStepTask(updateLaunchconfig),
commitReleaseVersion,
tagRelease,
releaseStepCommandAndRemaining(s";publishSigned;^ plugin/publishSigned"),
releaseStepCommandAndRemaining(s";publishSigned; plugin2_12/publishSigned; plugin3/publishSigned"),
releaseStepCommandAndRemaining("sonaRelease"),
setNextVersion,
commitNextVersion,
Expand Down Expand Up @@ -170,10 +169,19 @@ lazy val javaVmArgs: List[String] = {
java.lang.management.ManagementFactory.getRuntimeMXBean.getInputArguments.asScala.toList
}

lazy val plugin = (project in file("sbt-conscript")).
enablePlugins(SbtPlugin).
settings(
lazy val plugin = (projectMatrix in file("sbt-conscript"))
.jvmPlatform(scalaVersions = Seq("3.7.2", "2.12.20"))
.enablePlugins(SbtPlugin)
.settings(
commonSettings,
pluginCrossBuild / sbtVersion := {
scalaBinaryVersion.value match {
case "2.12" =>
"1.2.8"
case _ =>
"2.0.0-RC3"
}
},
buildInfo(packageName = "sbtconscript", v = Dependencies.launcherInterface.revision),
name := "sbt-conscript",
scriptedBufferLog := false,
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
Expand Down
9 changes: 9 additions & 0 deletions sbt-conscript/src/main/scala-2/ConscriptPluginCompat.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package sbtconscript

import java.io.File
import java.net.URL

private[sbtconscript] object ConscriptPluginCompat {
def toURL(u: URL): URL = u
def toClasspath(f: File): File = f
}
11 changes: 11 additions & 0 deletions sbt-conscript/src/main/scala-3/ConscriptPluginCompat.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package sbtconscript

import java.io.File
import java.net.URL
import java.net.URI
import java.nio.file.Path

private[sbtconscript] object ConscriptPluginCompat {
def toURL(u: URI): URL = u.toURL
def toClasspath(f: File): Path = f.toPath
}
5 changes: 3 additions & 2 deletions sbt-conscript/src/main/scala/ConscriptPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ object ConscriptPlugin extends AutoPlugin {
override lazy val requires = plugins.JvmPlugin
object autoImport {
lazy val csBoot = settingKey[File]("Boot directory used by csRun")
@transient
lazy val csWrite = taskKey[Unit]("Write test launchconfig files to conscript-output")
lazy val csRun = inputKey[Unit]("Run a named launchconfig, with parameters")
lazy val csSbtLauncherVersion = settingKey[String]("sbt launcher version")
Expand Down Expand Up @@ -64,14 +65,14 @@ object ConscriptPlugin extends AutoPlugin {
val launcherFile = conscriptHome / launcher
if(!launcherFile.exists) {
val u = url(s"https://repo1.maven.org/maven2/org/scala-sbt/launcher/$launcherVersion/launcher-$launcherVersion.jar")
sbt.io.Using.urlInputStream(u) { inputStream =>
sbt.io.Using.urlInputStream(ConscriptPluginCompat.toURL(u)) { inputStream =>
IO.transfer(inputStream, launcherFile)
}
}
val f = new sbt.ForkRun(ForkOptions())
f.run(
mainClass = "xsbt.boot.Boot",
classpath = launcherFile :: Nil,
classpath = ConscriptPluginCompat.toClasspath(launcherFile) :: Nil,
options = ("@" + config.toString) :: args.toList.tail,
log = streams.value.log
)
Expand Down
Loading