From 2904bdcb322e2369f61dacb8c61982d500f06798 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Aug 2014 20:27:23 -0400 Subject: [PATCH] #1541. Use HTTPS for Typesafe repository --- ivy/src/main/scala/sbt/Resolver.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index b0971950c..4ff1f10f0 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -148,7 +148,7 @@ sealed trait JavaNet1Repository extends Resolver { object Resolver { private[sbt] def useSecureResolvers = sys.props.get("sbt.repository.secure") map { _.toLowerCase == "true" } getOrElse true - val TypesafeRepositoryRoot = "http://repo.typesafe.com/typesafe" + val TypesafeRepositoryRoot = typesafeRepositoryRoot(useSecureResolvers) val SbtPluginRepositoryRoot = "http://repo.scala-sbt.org/scalasbt" val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories" val JavaNet2RepositoryName = "java.net Maven2 Repository" @@ -162,6 +162,8 @@ object Resolver { private[sbt] def javanet2RepositoryRoot(secure: Boolean) = if (secure) "https://maven.java.net/content/repositories/public/" 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" // obsolete: kept only for launcher compatibility private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases"