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

Merge pull request #1555 from sbt/fix/1541-scala-sbt 

#1541. Use HTTPS for sbt plugin repository
This commit is contained in:
Josh Suereth 2014-08-24 18:18:02 -04:00
parent 34ef2d2dd7 97110b6c9d
commit 98bdefb9c5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ivy/src/main/scala/sbt/Resolver.scala
View File

@ -149,7 +149,7 @@ object Resolver {
private[sbt] def useSecureResolvers = sys.props.get("sbt.repository.secure") map { _.toLowerCase == "true" } getOrElse true
val TypesafeRepositoryRoot = typesafeRepositoryRoot(useSecureResolvers)
val SbtPluginRepositoryRoot = "http://repo.scala-sbt.org/scalasbt"
val SbtPluginRepositoryRoot = sbtPluginRepositoryRoot(useSecureResolvers)
val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories"
val JavaNet2RepositoryName = "java.net Maven2 Repository"
val JavaNet2RepositoryRoot = javanet2RepositoryRoot(useSecureResolvers)
@ -164,7 +164,9 @@ object Resolver {
else "http://download.java.net/maven/2"
// TODO: This switch is only kept for backward compatibility. Hardcode to HTTPS in the future.
private[sbt] def typesafeRepositoryRoot(secure: Boolean) = (if (secure) "https" else "http") + "://repo.typesafe.com/typesafe"
// TODO: This switch is only kept for backward compatibility. Hardcode to HTTPS in the future.
private[sbt] def sbtPluginRepositoryRoot(secure: Boolean) = (if (secure) "https" else "http") + "://repo.scala-sbt.org/scalasbt"
// obsolete: kept only for launcher compatibility
private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases"
private[sbt] val ScalaToolsSnapshotsName = "Sonatype OSS Snapshots"