From 73c5d9737d44af1a7d4a2b8f73bc2c2917f61398 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 4 Apr 2019 11:35:12 +0200 Subject: [PATCH] Handle credentials key from global settings --- .../sbtcoursiershared/SbtCoursierShared.scala | 10 +++++++--- .../sbt-test/shared-1/credentials-global/build.sbt | 5 +++++ .../shared-1/credentials-global/global/build.sbt | 5 +++++ .../credentials-global/global/plugins/plugins.sbt | 13 +++++++++++++ .../credentials-global/src/main/scala/Main.scala | 1 + .../src/sbt-test/shared-1/credentials-global/test | 1 + .../shared-1/credentials-sbt-global/build.sbt | 5 +++++ .../credentials-sbt-global/global/build.sbt | 7 +++++++ .../global/plugins/plugins.sbt | 13 +++++++++++++ .../src/main/scala/Main.scala | 1 + .../sbt-test/shared-1/credentials-sbt-global/test | 1 + 11 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/build.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/src/main/scala/Main.scala create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/test create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/build.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/src/main/scala/Main.scala create mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/test diff --git a/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala b/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala index 55c1f78e5..c148091d3 100644 --- a/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala +++ b/modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala @@ -52,13 +52,17 @@ object SbtCoursierShared extends AutoPlugin { def publicationsSetting(packageConfigs: Seq[(sbt.Configuration, Configuration)]): Setting[_] = coursierPublications := ArtifactsTasks.coursierPublicationsTask(packageConfigs: _*).value + override def globalSettings: Seq[Setting[_]] = + Seq( + coursierUseSbtCredentials := true, + coursierCredentials := Map.empty, + coursierExtraCredentials := Nil + ) + override def buildSettings: Seq[Setting[_]] = Seq( coursierReorderResolvers := true, coursierKeepPreloaded := false, - coursierUseSbtCredentials := true, - coursierCredentials := Map.empty, - coursierExtraCredentials := Nil, coursierLogger := None, coursierCache := CacheDefaults.location ) diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt new file mode 100644 index 000000000..50fae1992 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/build.sbt @@ -0,0 +1,5 @@ +scalaVersion := "2.11.8" + +resolvers += "authenticated" at sys.env("TEST_REPOSITORY") + +libraryDependencies += "com.abc" % "test" % "0.1" 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 new file mode 100644 index 000000000..fe5b794ca --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/build.sbt @@ -0,0 +1,5 @@ +coursierExtraCredentials += coursier.credentials.Credentials( + uri(sys.env("TEST_REPOSITORY")).getHost, + sys.env("TEST_REPOSITORY_USER"), + sys.env("TEST_REPOSITORY_PASSWORD") +) diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt new file mode 100644 index 000000000..71a44ffd3 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt @@ -0,0 +1,13 @@ +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( + "plugin.version", + sys.error("plugin.version Java property not set") + ) + + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/src/main/scala/Main.scala new file mode 100644 index 000000000..86ae9e9e3 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/src/main/scala/Main.scala @@ -0,0 +1 @@ +object Main extends App \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/test b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/test new file mode 100644 index 000000000..103bd8d2f --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/test @@ -0,0 +1 @@ +> update diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt new file mode 100644 index 000000000..50fae1992 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/build.sbt @@ -0,0 +1,5 @@ +scalaVersion := "2.11.8" + +resolvers += "authenticated" at sys.env("TEST_REPOSITORY") + +libraryDependencies += "com.abc" % "test" % "0.1" diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/build.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/build.sbt new file mode 100644 index 000000000..587a2d12f --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/build.sbt @@ -0,0 +1,7 @@ +coursierUseSbtCredentials := true +credentials += Credentials( + "", + sys.env("TEST_REPOSITORY_HOST"), + sys.env("TEST_REPOSITORY_USER"), + sys.env("TEST_REPOSITORY_PASSWORD") +) diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt new file mode 100644 index 000000000..71a44ffd3 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt @@ -0,0 +1,13 @@ +addSbtPlugin { + + val name = sys.props.getOrElse( + "plugin.name", + sys.error("plugin.name Java property not set") + ) + val version = sys.props.getOrElse( + "plugin.version", + sys.error("plugin.version Java property not set") + ) + + "io.get-coursier" % name % version +} \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/src/main/scala/Main.scala new file mode 100644 index 000000000..86ae9e9e3 --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/src/main/scala/Main.scala @@ -0,0 +1 @@ +object Main extends App \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/test b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/test new file mode 100644 index 000000000..103bd8d2f --- /dev/null +++ b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/test @@ -0,0 +1 @@ +> update