mirror of https://github.com/sbt/sbt.git
Fix dangling ivy.xml without JAR files
Fixes #250 Ref https://github.com/sbt/sbt/issues/4661 Ref https://github.com/sbt/sbt-export-repo/pull/1
This commit is contained in:
parent
5efa7d5947
commit
2914a97c58
|
|
@ -13,7 +13,7 @@ install:
|
|||
Add-Type -AssemblyName System.IO.Compression.FileSystem
|
||||
if (!(Test-Path -Path "C:\sbt" )) {
|
||||
(new-object System.Net.WebClient).DownloadFile(
|
||||
'https://piccolo.link/sbt-0.13.17.zip',
|
||||
'https://piccolo.link/sbt-0.13.18.zip',
|
||||
'C:\sbt-bin.zip'
|
||||
)
|
||||
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sbt-bin.zip", "C:\sbt")
|
||||
|
|
@ -22,7 +22,7 @@ install:
|
|||
- SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g -Dfile.encoding=UTF8
|
||||
|
||||
test_script:
|
||||
- sbt "-Dsbt.build.version=1.1.2" universal:packageBin
|
||||
- sbt "-Dsbt.build.version=1.2.8" universal:packageBin
|
||||
- cd citest
|
||||
- test.bat
|
||||
- test1.bat
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ language: scala
|
|||
|
||||
env:
|
||||
global:
|
||||
- SBT_VER=1.2.4
|
||||
- SBT_VER=1.2.8
|
||||
|
||||
matrix:
|
||||
include:
|
||||
|
|
|
|||
36
build.sbt
36
build.sbt
|
|
@ -14,6 +14,24 @@ lazy val sbtOfflineInstall =
|
|||
lazy val sbtVersionToRelease = sys.props.getOrElse("sbt.build.version", sys.env.getOrElse("sbt.build.version", {
|
||||
sys.error("-Dsbt.build.version must be set")
|
||||
}))
|
||||
|
||||
lazy val scala210 = "2.10.7"
|
||||
lazy val scala212 = "2.12.8"
|
||||
lazy val scala210Jline = "org.scala-lang" % "jline" % scala210
|
||||
lazy val jansi = {
|
||||
if (sbtVersionToRelease startsWith "1.") "org.fusesource.jansi" % "jansi" % "1.4"
|
||||
else "org.fusesource.jansi" % "jansi" % "1.4"
|
||||
}
|
||||
lazy val scala212Jline = "jline" % "jline" % "2.14.6"
|
||||
lazy val scala212Xml = "org.scala-lang.modules" % "scala-xml_2.12" % "1.0.6"
|
||||
lazy val scala212Compiler = "org.scala-lang" % "scala-compiler" % scala212
|
||||
lazy val sbtActual = "org.scala-sbt" % "sbt" % sbtVersionToRelease
|
||||
|
||||
lazy val sbt013ExtraDeps = {
|
||||
if (sbtVersionToRelease startsWith "0.13.") Seq(scala210Jline)
|
||||
else Seq()
|
||||
}
|
||||
|
||||
lazy val isExperimental = (sbtVersionToRelease contains "RC") || (sbtVersionToRelease contains "M")
|
||||
val sbtLaunchJarUrl = SettingKey[String]("sbt-launch-jar-url")
|
||||
val sbtLaunchJarLocation = SettingKey[File]("sbt-launch-jar-location")
|
||||
|
|
@ -288,24 +306,6 @@ def publishToSettings =
|
|||
def bintrayRelease(repo: BintrayRepo, pkg: String, version: String, log: Logger): Unit =
|
||||
repo.release(pkg, version, log)
|
||||
|
||||
|
||||
lazy val scala210 = "2.10.7"
|
||||
lazy val scala212 = "2.12.7"
|
||||
lazy val scala210Jline = "org.scala-lang" % "jline" % scala210
|
||||
lazy val jansi = {
|
||||
if (sbtVersionToRelease startsWith "1.") "org.fusesource.jansi" % "jansi" % "1.4"
|
||||
else "org.fusesource.jansi" % "jansi" % "1.4"
|
||||
}
|
||||
lazy val scala212Jline = "jline" % "jline" % "2.14.6"
|
||||
lazy val scala212Xml = "org.scala-lang.modules" % "scala-xml_2.12" % "1.0.6"
|
||||
lazy val scala212Compiler = "org.scala-lang" % "scala-compiler" % scala212
|
||||
lazy val sbtActual = "org.scala-sbt" % "sbt" % sbtVersionToRelease
|
||||
|
||||
lazy val sbt013ExtraDeps = {
|
||||
if (sbtVersionToRelease startsWith "0.13.") Seq(scala210Jline)
|
||||
else Seq()
|
||||
}
|
||||
|
||||
def downloadUrl(uri: URI, out: File): Unit =
|
||||
{
|
||||
import dispatch.classic._
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M9")
|
||||
libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.10"
|
||||
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
|
||||
addSbtPlugin("com.eed3si9n" % "sbt-export-repo" % "0.1.0")
|
||||
addSbtPlugin("com.eed3si9n" % "sbt-export-repo" % "0.1.1")
|
||||
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
|
||||
|
|
|
|||
Loading…
Reference in New Issue