diff --git a/build.sbt b/build.sbt index f3eb3a009..a32062f56 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ lazy val `lm-coursier` = project .settings( shared, libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % "1.1.0-M14-1", + "io.get-coursier" %% "coursier" % "1.1.0-M14-2", // We depend on librarymanagement-ivy rather than just // librarymanagement-core to handle the ModuleDescriptor passed // to DependencyResolutionInterface.update, which is an diff --git a/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/InputsTasks.scala b/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/InputsTasks.scala index 417f510cd..49bacf29a 100644 --- a/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/InputsTasks.scala +++ b/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/InputsTasks.scala @@ -208,6 +208,8 @@ object InputsTasks { .withUsername(c.userName) .withPassword(c.passwd) .withRealm(Some(c.realm).filter(_.nonEmpty)) + .withHttpsOnly(false) + .withMatchHost(true) } } else diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt index 863b76a75..d69b7f7dc 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/build.sbt @@ -9,6 +9,8 @@ coursierExtraCredentials += { s"""foo.host=${uri(sys.env("TEST_REPOSITORY")).getHost} |foo.username=user |foo.password=pass + |foo.auto=true + |foo.https-only=false """.stripMargin val dest = baseDirectory.in(ThisBuild).value / "project" / "target" / "cred" Files.write(dest.toPath, content.getBytes("UTF-8")) diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/build.sbt index fe5b794ca..59c5f99be 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/build.sbt @@ -2,4 +2,4 @@ coursierExtraCredentials += coursier.credentials.Credentials( uri(sys.env("TEST_REPOSITORY")).getHost, sys.env("TEST_REPOSITORY_USER"), sys.env("TEST_REPOSITORY_PASSWORD") -) +).withHttpsOnly(false).withMatchHost(true) diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt index 8d8515275..4f1076d20 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials/build.sbt @@ -6,6 +6,6 @@ coursierExtraCredentials += coursier.credentials.Credentials( uri(sys.env("TEST_REPOSITORY")).getHost, sys.env("TEST_REPOSITORY_USER"), sys.env("TEST_REPOSITORY_PASSWORD") -) +).withHttpsOnly(false).withMatchHost(true) libraryDependencies += "com.abc" % "test" % "0.1"