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

Merge pull request #5576 from eed3si9n/wip/bumplauncher 

update to launcher 1.1.4
This commit is contained in:
eugene yokota 2020-05-28 17:00:00 -04:00 committed by GitHub
parent e165629d74 4bb4c3a9b6
commit 24f367fa07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/Defaults.scala
View File

@ -3785,7 +3785,8 @@ object Classpaths {
private[this] def bootRepository(repo: xsbti.Repository): Resolver = { private[this] def bootRepository(repo: xsbti.Repository): Resolver = {
import xsbti.Predefined import xsbti.Predefined
repo match { repo match {
case m: xsbti.MavenRepository => MavenRepository(m.id, m.url.toString) case m: xsbti.MavenRepository =>
MavenRepository(m.id, m.url.toString).withAllowInsecureProtocol(m.allowInsecureProtocol)
case i: xsbti.IvyRepository => case i: xsbti.IvyRepository =>
val patterns = Patterns( val patterns = Patterns(
Vector(i.ivyPattern), Vector(i.ivyPattern),
@ -3799,7 +3800,8 @@ object Classpaths {
// This hackery is to deal suitably with UNC paths on Windows. Once we can assume Java7, Paths should save us from this. // This hackery is to deal suitably with UNC paths on Windows. Once we can assume Java7, Paths should save us from this.
val file = IO.toFile(i.url) val file = IO.toFile(i.url)
Resolver.file(i.id, file)(patterns) Resolver.file(i.id, file)(patterns)
case _ => Resolver.url(i.id, i.url)(patterns) case _ =>
Resolver.url(i.id, i.url)(patterns).withAllowInsecureProtocol(i.allowInsecureProtocol)
} }
case p: xsbti.PredefinedRepository => case p: xsbti.PredefinedRepository =>
p.id match { p.id match {

2
project/Dependencies.scala
View File

@ -21,7 +21,7 @@ object Dependencies {
private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion
private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
val launcherVersion = "1.1.3" val launcherVersion = "1.1.4"
val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion
val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion
val testInterface = "org.scala-sbt" % "test-interface" % "1.0" val testInterface = "org.scala-sbt" % "test-interface" % "1.0"

5
sbt/src/test/scala/sbt/internal/scriptedtest/ScriptedLauncher.java
View File

@ -560,6 +560,11 @@ public class ScriptedLauncher {
return id; return id;
} }
@Override
public boolean allowInsecureProtocol() {
return false;
}
@Override @Override
public URL url() { public URL url() {
try { try {