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

Merge pull request #333 from eed3si9n/wip/rtexport 

Fix fetching of RT Export
This commit is contained in:
eugene yokota 2020-09-26 07:29:44 -04:00 committed by GitHub
parent ea440e5987 0e459fc9f3
commit f170d29481
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -26,6 +26,7 @@ matrix:
- curl https://piccolo.link/sbt-$SBT_VER.zip -L --output /tmp/sbt.zip - curl https://piccolo.link/sbt-$SBT_VER.zip -L --output /tmp/sbt.zip
- unzip /tmp/sbt.zip -d $HOME/sbt - unzip /tmp/sbt.zip -d $HOME/sbt
- export PATH="$HOME/sbt/sbt/bin:$PATH" - export PATH="$HOME/sbt/sbt/bin:$PATH"
- bin/coursier.bat resolve
script: script:
- sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test
- cd citest - cd citest
@ -45,6 +46,7 @@ matrix:
- curl https://piccolo.link/sbt-$SBT_VER.zip -L --output /tmp/sbt.zip - curl https://piccolo.link/sbt-$SBT_VER.zip -L --output /tmp/sbt.zip
- unzip /tmp/sbt.zip -d $HOME/sbt - unzip /tmp/sbt.zip -d $HOME/sbt
- export PATH="$HOME/sbt/sbt/bin:$PATH" - export PATH="$HOME/sbt/sbt/bin:$PATH"
- bin/coursier resolve
script: script:
- sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test
- cd citest && ./test.sh - cd citest && ./test.sh
@ -73,6 +75,7 @@ install:
- curl https://piccolo.link/sbt-$SBT_VER.zip -L --output /tmp/sbt.zip - curl https://piccolo.link/sbt-$SBT_VER.zip -L --output /tmp/sbt.zip
- unzip /tmp/sbt.zip -d $HOME/sbt - unzip /tmp/sbt.zip -d $HOME/sbt
- export PATH="$HOME/sbt/sbt/bin:$PATH" - export PATH="$HOME/sbt/sbt/bin:$PATH"
- bin/coursier resolve
cache: cache:
directories: directories:

13
build.sbt
View File

@ -59,6 +59,7 @@ val windowsBuildId = settingKey[Int]("build id for Windows installer")
val debianBuildId = settingKey[Int]("build id for Debian") val debianBuildId = settingKey[Int]("build id for Debian")
val exportRepoUsingCoursier = taskKey[File]("export Maven style repository") val exportRepoUsingCoursier = taskKey[File]("export Maven style repository")
val rtExportUsingCoursier = taskKey[File]("Grab RT export utility")
val exportRepoCsrDirectory = settingKey[File]("") val exportRepoCsrDirectory = settingKey[File]("")
val x86MacPlatform = "x86_64-apple-darwin" val x86MacPlatform = "x86_64-apple-darwin"
@ -244,6 +245,15 @@ val root = (project in file(".")).
packageName in Universal := packageName.value, // needs to be set explicitly due to a bug in native-packager packageName in Universal := packageName.value, // needs to be set explicitly due to a bug in native-packager
version in Universal := sbtVersionToRelease, version in Universal := sbtVersionToRelease,
rtExportUsingCoursier := {
val csr =
if (isWindows) (baseDirectory in LocalRootProject).value / "bin" / "coursier.bat"
else (baseDirectory in LocalRootProject).value / "bin" / "coursier"
val cache = target.value / "coursier"
s"$csr fetch --cache $cache ${colonName(java9rtexport)}".!
(cache ** "*.jar").get.head
},
mappings in Universal := { mappings in Universal := {
val t = (target in Universal).value val t = (target in Universal).value
val prev = (mappings in Universal).value val prev = (mappings in Universal).value
@ -275,7 +285,7 @@ val root = (project in file(".")).
mappings in Universal ++= { mappings in Universal ++= {
val launchJar = sbtLaunchJar.value val launchJar = sbtLaunchJar.value
val rtExportJar = ((exportRepoCsrDirectory in dist).value / "org/scala-sbt/rt/java9-rt-export" / java9rtexportVersion / s"java9-rt-export-${java9rtexportVersion}.jar") val rtExportJar = rtExportUsingCoursier.value
Seq( Seq(
launchJar -> "bin/sbt-launch.jar", launchJar -> "bin/sbt-launch.jar",
rtExportJar -> "bin/java9-rt-export.jar" rtExportJar -> "bin/java9-rt-export.jar"
@ -446,7 +456,6 @@ lazy val dist = (project in file("dist"))
s"$csr fetch --cache $cache ${colonName(jansi)}".! s"$csr fetch --cache $cache ${colonName(jansi)}".!
s"$csr fetch --cache $cache ${colonName(scala212Compiler)}".! s"$csr fetch --cache $cache ${colonName(scala212Compiler)}".!
s"$csr fetch --cache $cache ${colonName(scala212Xml)}".! s"$csr fetch --cache $cache ${colonName(scala212Xml)}".!
s"$csr fetch --cache $cache ${colonName(java9rtexport)}".!
val mavenCache = cache / "https" / "repo1.maven.org" / "maven2" val mavenCache = cache / "https" / "repo1.maven.org" / "maven2"
val compilerBridgeVer = IO.listFiles(mavenCache / "org" / "scala-sbt" / "compiler-bridge_2.12", DirectoryFilter).toList.headOption val compilerBridgeVer = IO.listFiles(mavenCache / "org" / "scala-sbt" / "compiler-bridge_2.12", DirectoryFilter).toList.headOption
compilerBridgeVer match { compilerBridgeVer match {