From a85b486b4c4545dd1beabd39cf51321545bc57e1 Mon Sep 17 00:00:00 2001 From: eugene yokota Date: Wed, 15 May 2019 10:52:39 -0400 Subject: [PATCH] export repo using Coursier (#267) export repo using Coursier Ref https://github.com/sbt/sbt/issues/4661 --- .appveyor.yml | 2 +- .travis.yml | 2 +- bin/coursier | Bin 0 -> 18500 bytes bin/coursier.bat | 95 ++++++++++++++++++++++++++++++++ build.sbt | 46 ++++++++++++---- citest/build.sbt | 3 +- citest/project/build.properties | 2 +- citest/test.bat | 2 +- citest/test.sh | 8 +-- citest/test1.bat | 2 +- citest/test2.bat | 2 +- src/universal/bin/sbt | 2 +- src/universal/bin/sbt.bat | 4 +- 13 files changed, 145 insertions(+), 25 deletions(-) create mode 100755 bin/coursier create mode 100644 bin/coursier.bat diff --git a/.appveyor.yml b/.appveyor.yml index 680470c9d..f0c903f69 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,7 +22,7 @@ install: - SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g -Dfile.encoding=UTF8 test_script: - - sbt "-Dsbt.build.version=1.2.8" universal:packageBin + - sbt "-Dsbt.build.version=1.3.0-M4" universal:packageBin - cd citest - test.bat - test1.bat diff --git a/.travis.yml b/.travis.yml index 213d7d1ce..7f51ec42d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ language: scala env: global: - - SBT_VER=1.2.8 + - SBT_VER=1.3.0-M4 matrix: include: diff --git a/bin/coursier b/bin/coursier new file mode 100755 index 0000000000000000000000000000000000000000..e808b0db087e04b23284c027ceb95bd143182bc8 GIT binary patch literal 18500 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 "bin/sbt-launch.jar", rtExportJar -> "bin/java9-rt-export.jar") }, mappings in Universal ++= (Def.taskDyn { - if (sbtOfflineInstall) + if (sbtOfflineInstall && sbtVersionToRelease.startsWith("1.")) + Def.task { + val _ = (exportRepoUsingCoursier in dist).value + directory((target in dist).value / "lib") + } + else if (sbtOfflineInstall) Def.task { val _ = (exportRepo in dist).value directory((target in dist).value / "lib") @@ -330,15 +339,7 @@ lazy val dist = (project in file("dist")) val old = exportRepo.value sbtVersionToRelease match { case v if v.startsWith("1.") => - val zincBase = exportRepoDirectory.value / "org.scala-sbt" / "zinc_2.12" - val zincVersion = (zincBase * DirectoryFilter).get.head.getName - val utilBase = exportRepoDirectory.value / "org.scala-sbt" / "util-logging_2.12" - val utilVersion = (utilBase * DirectoryFilter).get.head.getName - val outbase = exportRepoDirectory.value / "org" / "scala-sbt" / "compiler-interface" / zincVersion - val uribase = s"https://oss.sonatype.org/content/repositories/public/org/scala-sbt/compiler-interface/$zincVersion/" - downloadUrl(uri(uribase + s"compiler-interface-${zincVersion}.jar"), outbase / s"compiler-interface-${zincVersion}.jar") - downloadUrl(uri(uribase + s"compiler-interface-${zincVersion}-sources.jar"), outbase / s"compiler-interface-${zincVersion}-sources.jar") - downloadUrl(uri(uribase + s"compiler-interface-${zincVersion}.pom"), outbase / s"compiler-interface-${zincVersion}.pom") + sys.error("sbt 1.x should use coursier") case v if v.startsWith("0.13.") => val outbase = exportRepoDirectory.value / "org.scala-sbt" / "compiler-interface" / v val uribase = s"https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/$v/" @@ -350,6 +351,31 @@ lazy val dist = (project in file("dist")) old }, exportRepoDirectory := target.value / "lib" / "local-preloaded", + exportRepoCsrDirectory := exportRepoDirectory.value, + exportRepoUsingCoursier := { + val outDirectory = exportRepoCsrDirectory.value + val csr = + if (isWindows) (baseDirectory in LocalRootProject).value / "bin" / "coursier.bat" + else (baseDirectory in LocalRootProject).value / "bin" / "coursier" + val cache = target.value / "coursier" + IO.delete(cache) + val v = sbtVersionToRelease + s"$csr fetch --cache $cache org.scala-sbt:sbt:$v".! + val mavenCache = cache / "https" / "repo1.maven.org" / "maven2" + val compilerBridgeVer = IO.listFiles(mavenCache / "org" / "scala-sbt" / "compiler-bridge_2.12", DirectoryFilter).toList.headOption + compilerBridgeVer match { + case Some(bridgeDir) => + val bridgeVer = bridgeDir.getName + s"$csr fetch --cache $cache --sources org.scala-sbt:compiler-bridge_2.10:$bridgeVer".! + s"$csr fetch --cache $cache --sources org.scala-sbt:compiler-bridge_2.11:$bridgeVer".! + s"$csr fetch --cache $cache --sources org.scala-sbt:compiler-bridge_2.12:$bridgeVer".! + s"$csr fetch --cache $cache --sources org.scala-sbt:compiler-bridge_2.13:$bridgeVer".! + case _ => + sys.error("bridge not found") + } + IO.copyDirectory(mavenCache, outDirectory, true, true) + outDirectory + }, conflictWarning := ConflictWarning.disable, publish := (), publishLocal := (), diff --git a/citest/build.sbt b/citest/build.sbt index 3ff4eae20..77123e433 100644 --- a/citest/build.sbt +++ b/citest/build.sbt @@ -10,11 +10,10 @@ lazy val root = (project in file(".")) println(xs) assert(xs(0) startsWith "[info] Loading project definition") - assert(xs(1) startsWith "[info] Loading settings from build.sbt") + assert(xs(1) startsWith "[info] Loading settings") assert(xs(2) startsWith "[info] Set current project to Hello") assert(xs(3) startsWith "[info] This is sbt") assert(xs(4) startsWith "[info] The current project") - assert(xs(5) startsWith "[info] The current project is built against Scala 2.12.4") val ys = IO.readLines(file("err.txt")).toVector.distinct diff --git a/citest/project/build.properties b/citest/project/build.properties index 31334bbd3..c491602bb 100644 --- a/citest/project/build.properties +++ b/citest/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.1 +sbt.version=1.3.0-M4 diff --git a/citest/test.bat b/citest/test.bat index 9234e6201..6dc88bae4 100644 --- a/citest/test.bat +++ b/citest/test.bat @@ -13,6 +13,6 @@ SET JAVA_HOME=C:\jdk11 SET PATH=C:\jdk11\bin;%PATH% SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8 -"freshly-baked\sbt\bin\sbt" about +"freshly-baked\sbt\bin\sbt" "-Dsbt.no.format=true" about ENDLOCAL diff --git a/citest/test.sh b/citest/test.sh index 53c9c6db6..c25555881 100755 --- a/citest/test.sh +++ b/citest/test.sh @@ -23,14 +23,14 @@ fail() { } env HOME=./target/home1 ./freshly-baked/sbt/bin/sbt about -test -d ./target/home1/.sbt/preloaded/org.scala-sbt || fail "expected to find preloaded in ./target/home1/.sbt" +test -d ./target/home1/.sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home1/.sbt" env HOME=./target/home2 ./freshly-baked/sbt/bin/sbt -sbt-dir ./target/home2/alternate-sbt about -test -d ./target/home2/alternate-sbt/preloaded/org.scala-sbt || fail "expected to find preloaded in ./target/home2/alternate-sbt" +test -d ./target/home2/alternate-sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home2/alternate-sbt" env HOME=./target/home3 ./freshly-baked/sbt/bin/sbt -J-Dsbt.preloaded=./target/home3/alternate-preloaded about -test -d ./target/home3/alternate-preloaded/org.scala-sbt || fail "expected to find preloaded in ./target/home3/alternate-preloaded" +test -d ./target/home3/alternate-preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home3/alternate-preloaded" env HOME=./target/home4 ./freshly-baked/sbt/bin/sbt -J-Dsbt.global.base=./target/home4/global-base about -test -d ./target/home4/global-base/preloaded/org.scala-sbt || fail "expected to find preloaded in ./target/home4/global-base" +test -d ./target/home4/global-base/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home4/global-base" diff --git a/citest/test1.bat b/citest/test1.bat index 4036c2593..9ac5f2b1c 100644 --- a/citest/test1.bat +++ b/citest/test1.bat @@ -6,6 +6,6 @@ SET JAVA_HOME=C:\jdk11 SET PATH=C:\jdk11\bin;%PATH% SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8 -"freshly-baked\sbt\bin\sbt" about 1> output.txt 2> err.txt +"freshly-baked\sbt\bin\sbt" "-Dsbt.no.format=true" about 1> output.txt 2> err.txt ENDLOCAL diff --git a/citest/test2.bat b/citest/test2.bat index 2c42c7288..ebd74afe8 100644 --- a/citest/test2.bat +++ b/citest/test2.bat @@ -6,6 +6,6 @@ SET JAVA_HOME=C:\jdk11 SET PATH=C:\jdk11\bin;%PATH% SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8 -"freshly-baked\sbt\bin\sbt" check +"freshly-baked\sbt\bin\sbt" "-Dsbt.no.format=true" check ENDLOCAL diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt index 7447bb89b..1a4e02524 100755 --- a/src/universal/bin/sbt +++ b/src/universal/bin/sbt @@ -264,7 +264,7 @@ syncPreloaded() { local target_preloaded="$(getPreloaded)" if [[ "$init_sbt_version" == "" ]]; then # FIXME: better $init_sbt_version detection - init_sbt_version="$(ls -1 "$source_preloaded/org.scala-sbt/sbt/")" + init_sbt_version="$(ls -1 "$source_preloaded/org/scala-sbt/sbt/")" fi [[ -f "$target_preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || { # lib/local-preloaded exists (This is optional) diff --git a/src/universal/bin/sbt.bat b/src/universal/bin/sbt.bat index f909ec0fb..b67083271 100644 --- a/src/universal/bin/sbt.bat +++ b/src/universal/bin/sbt.bat @@ -190,11 +190,11 @@ exit /B 0 :sync_preloaded if "%INIT_SBT_VERSION%"=="" ( rem FIXME: better %INIT_SBT_VERSION% detection - FOR /F "tokens=* USEBACKQ" %%F IN (`dir /b "%SBT_HOME%\..\lib\local-preloaded\org.scala-sbt\sbt" /B`) DO ( + FOR /F "tokens=* USEBACKQ" %%F IN (`dir /b "%SBT_HOME%\..\lib\local-preloaded\org\scala-sbt\sbt" /B`) DO ( SET INIT_SBT_VERSION=%%F ) ) -set PRELOAD_SBT_JAR="%UserProfile%\.sbt\preloaded\org.scala-sbt\sbt\%INIT_SBT_VERSION%\jars\sbt.jar" +set PRELOAD_SBT_JAR="%UserProfile%\.sbt\preloaded\org\scala-sbt\sbt\%INIT_SBT_VERSION%\" if /I %JAVA_VERSION% GEQ 8 ( where robocopy >nul 2>nul if %ERRORLEVEL% equ 0 (