From 798ca8b786c5b7262dfbb86e105994f80638a2f3 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 14 May 2020 16:36:14 +0200 Subject: [PATCH 1/2] Build plugins with sbt 1.3.x --- modules/sbt-lm-coursier/src/main/scala/sbt/hack/Foo.scala | 6 ++---- project/Settings.scala | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/sbt-lm-coursier/src/main/scala/sbt/hack/Foo.scala b/modules/sbt-lm-coursier/src/main/scala/sbt/hack/Foo.scala index c26e0da7d..2fbb4f940 100644 --- a/modules/sbt-lm-coursier/src/main/scala/sbt/hack/Foo.scala +++ b/modules/sbt-lm-coursier/src/main/scala/sbt/hack/Foo.scala @@ -67,6 +67,8 @@ object Foo { ewo = evictionOptions, mavenStyle = publishMavenStyle.value, compatWarning = compatibilityWarningOptions.value, + includeCallers = false, + includeDetails = false, log = s.log ) } catch { @@ -90,8 +92,6 @@ object Foo { ewo: EvictionWarningOptions, mavenStyle: Boolean, compatWarning: CompatibilityWarningOptions, - includeCallers: Boolean, - includeDetails: Boolean, log: Logger ): UpdateReport }].cachedUpdate( @@ -110,8 +110,6 @@ object Foo { ewo = evictionOptions, mavenStyle = publishMavenStyle.value, compatWarning = compatibilityWarningOptions.value, - includeCallers = false, - includeDetails = false, log = s.log ) } diff --git a/project/Settings.scala b/project/Settings.scala index 3b4e1ee1c..550d67a7e 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -11,7 +11,7 @@ object Settings { def scala212 = "2.12.10" - def targetSbtVersion = "1.2.8" + def targetSbtVersion = "1.3.1" private lazy val isAtLeastScala213 = Def.setting { import Ordering.Implicits._ @@ -56,8 +56,9 @@ object Settings { "-Xmx1024M", "-Dplugin.name=" + name.value, "-Dplugin.version=" + version.value, - "-Dsbttest.base=" + (sourceDirectory.value / "sbt-test").getAbsolutePath, - "-Dcoursier.sbt-launcher.add-plugin=false" + "-Dcoursier.sbt-launcher.add-plugin=true", + "-Dcoursier.sbt-launcher.plugin=" + name.value, + "-Dcoursier.sbt-launcher.plugin-version=" + version.value ), scriptedBufferLog := false, sbtPlugin := true, From 544538cda96b11b46754b2fcd978b0f70fe2907e Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 14 May 2020 20:06:02 +0200 Subject: [PATCH 2/2] Clean-up scripted tests --- .../dependency-graph/project/plugins.sbt | 13 ------------- .../in-memory-cache/project/plugins.sbt | 13 ------------- .../src/sbt-test/sbt-coursier/s3/project/extra.sbt | 1 - .../sbt-test/sbt-coursier/s3/project/plugins.sbt | 2 +- .../sbt-coursier/s3/project/project/plugins.sbt | 13 ------------- .../sbt-lm-coursier/cp-order/project/plugins.sbt | 13 ------------- .../sbt-lm-coursier/evicted/project/plugins.sbt | 13 ------------- .../project/plugins.sbt | 13 ------------- .../project/plugins.sbt | 13 ------------- .../typelevel-with-dependencies/project/plugins.sbt | 13 ------------- .../scala-211/typelevel/project/plugins.sbt | 13 ------------- .../shared-1/aar-packaging/project/plugins.sbt | 13 ------------- .../all-exclude-dependencies/project/plugins.sbt | 13 ------------- .../sbt-test/shared-1/api-url/project/plugins.sbt | 13 ------------- .../shared-1/auto-scala-library/project/plugins.sbt | 13 ------------- .../shared-1/cache-local/project/plugins.sbt | 13 ------------- .../sbt-test/shared-1/caller/project/plugins.sbt | 13 ------------- .../shared-1/classifiers/project/plugins.sbt | 13 ------------- .../src/sbt-test/shared-1/clean/project/plugins.sbt | 13 ------------- .../config-deps-resolution/project/plugins.sbt | 13 ------------- .../project/plugins.sbt | 13 ------------- .../credentials-from-file/project/plugins.sbt | 13 ------------- .../credentials-global/global/plugins/plugins.sbt | 13 ------------- .../shared-1/credentials-legacy/project/plugins.sbt | 13 ------------- .../global/plugins/plugins.sbt | 13 ------------- .../shared-1/credentials-sbt/project/plugins.sbt | 13 ------------- .../shared-1/credentials/project/plugins.sbt | 13 ------------- .../shared-1/default-artifact/project/plugins.sbt | 13 ------------- .../dependency-overrides/project/plugins.sbt | 13 ------------- .../dotty-scala-instance/project/plugins.sbt | 1 - .../project/project/plugins.sbt | 13 ------------- .../src/sbt-test/shared-1/dotty/project/plugins.sbt | 1 - .../shared-1/dotty/project/project/plugins.sbt | 13 ------------- .../exclude-dependencies/project/plugins.sbt | 13 ------------- .../project/plugins.sbt | 13 ------------- .../shared-1/from-no-head/project/plugins.sbt | 13 ------------- .../shared-1/from-wrong-url/project/plugins.sbt | 13 ------------- .../src/sbt-test/shared-1/from/project/plugins.sbt | 13 ------------- .../global-plugins/project/project/plugins.sbt | 13 ------------- .../project/plugins.sbt | 13 ------------- .../inter-project-resolvers/project/plugins.sbt | 13 ------------- .../inter-project-scala-tool/project/plugins.sbt | 13 ------------- .../shared-1/inter-project/project/plugins.sbt | 13 ------------- .../sbt-test/shared-1/logger/project/plugins.sbt | 13 ------------- .../shared-2/maven-compatible/project/plugins.sbt | 13 ------------- .../maven-plugin-classpath-type/project/plugins.sbt | 1 - .../project/project/plugins.sbt | 13 ------------- .../missing-credentials/project/plugins.sbt | 13 ------------- .../sbt-test/shared-2/missingok/project/plugins.sbt | 13 ------------- .../shared-2/neo-sbt-scalafmt/project/plugins.sbt | 13 ------------- .../shared-2/no-pom-artifact/project/plugins.sbt | 13 ------------- .../sbt-test/shared-2/profiles/project/plugins.sbt | 13 ------------- .../publish-local-signed/project/plugins.sbt | 13 ------------- .../project/plugins.sbt | 13 ------------- .../shared-2/sbt-assembly/project/extra.sbt | 1 - .../shared-2/sbt-assembly/project/plugins.sbt | 2 +- .../sbt-assembly/project/project/plugins.sbt | 13 ------------- .../shared-2/sbt-ci-release/project/plugins.sbt | 1 - .../sbt-ci-release/project/project/plugins.sbt | 13 ------------- .../shared-2/scala-jars/project/plugins.sbt | 13 ------------- .../sbt-test/shared-2/scala-js/project/plugins.sbt | 13 ------------- .../scala-sources-javadoc-jars/project/plugins.sbt | 13 ------------- .../semver-reconciliation/project/plugins.sbt | 13 ------------- .../sbt-test/shared-2/simple/project/plugins.sbt | 13 ------------- .../strict-conflict-manager/project/plugins.sbt | 13 ------------- .../shared-2/tests-classifier/project/plugins.sbt | 13 ------------- .../sbt-test/shared-2/unidoc/project/plugins.sbt | 13 ------------- .../update-sbt-classifiers/project/plugins.sbt | 13 ------------- .../src/sbt-test/shared-2/url/project/plugins.sbt | 13 ------------- .../shared-2/version-interval/project/plugins.sbt | 13 ------------- .../version-reconciliation/project/plugins.sbt | 13 ------------- .../whitespace-resolver/project/plugins.sbt | 13 ------------- .../sbt-test/shared-2/zookeeper/project/plugins.sbt | 13 ------------- project/Settings.scala | 2 -- 74 files changed, 2 insertions(+), 855 deletions(-) delete mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/api-url/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/cache-local/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/caller/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/credentials/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/default-artifact/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/dotty/project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/from-no-head/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/from/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/inter-project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-1/logger/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/missingok/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/profiles/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/extra.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/tests-classifier/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/url/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/version-interval/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/project/plugins.sbt delete mode 100644 modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/sbt-coursier/in-memory-cache/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/sbt-coursier/s3/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt deleted file mode 100644 index 8bb66653d..000000000 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/extra.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.18.0") \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt index 3a2d48ea4..8bb66653d 100644 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/plugins.sbt @@ -1 +1 @@ -addSbtCoursier +addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.18.0") \ No newline at end of file diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/sbt-lm-coursier/cp-order/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/cp-order/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/sbt-lm-coursier/evicted/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/evicted/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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 -} diff --git a/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/sbt-lm-coursier/update-classifiers-1.3.0-RC1/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/scala-211/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-force-version-stdlib/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/scala-211/typelevel-with-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel-with-dependencies/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/scala-211/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/scala-211/typelevel/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/aar-packaging/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/aar-packaging/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/all-exclude-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/all-exclude-dependencies/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/api-url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/api-url/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/api-url/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/auto-scala-library/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/auto-scala-library/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/cache-local/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/cache-local/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/cache-local/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/caller/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/caller/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/caller/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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 -} diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/classifiers/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/clean/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/clean/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/config-deps-resolution/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/config-deps-resolution/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-from-file-legacy/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file-legacy/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-from-file/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-from-file/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/global/plugins/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-global/global/plugins/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-legacy/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-legacy/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/global/plugins/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt-global/global/plugins/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials-sbt/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/credentials/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/credentials/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/default-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/default-artifact/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/default-artifact/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/dependency-overrides/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/dependency-overrides/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/dotty-scala-instance/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/plugins.sbt index 7b0d11a1f..ee5f80c1b 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.3") -addSbtCoursier diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/dotty-scala-instance/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/dotty/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/dotty/project/plugins.sbt index 115463586..b5de60fc6 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-1/dotty/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-1/dotty/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.0") -addSbtCoursier diff --git a/modules/sbt-coursier/src/sbt-test/shared-1/dotty/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/dotty/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/dotty/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/exclude-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/exclude-dependencies/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/fallback-dependencies-inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/fallback-dependencies-inter-project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/from-no-head/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from-no-head/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/from-no-head/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/from-wrong-url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/from-wrong-url/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/from/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/from/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/from/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/global-plugins/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/global-plugins/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/inter-project-resolvers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-resolvers/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/inter-project-scala-tool/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project-scala-tool/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/inter-project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/inter-project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/logger/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-1/logger/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-1/logger/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/maven-compatible/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/maven-compatible/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/maven-plugin-classpath-type/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt index a8b4cde61..1f7bae5f9 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/plugins.sbt @@ -1,2 +1 @@ -addSbtCoursier addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.25") diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/maven-plugin-classpath-type/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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 -} diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/missing-credentials/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/missingok/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/missingok/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/missingok/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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 -} diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/neo-sbt-scalafmt/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/no-pom-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/no-pom-artifact/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/profiles/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/profiles/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/profiles/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/publish-local-signed/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/publish-local-signed/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/publish-local-sources-javadoc-conf/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/publish-local-sources-javadoc-conf/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/sbt-assembly/project/extra.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/extra.sbt deleted file mode 100644 index 652a3b93b..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/extra.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt index 3a2d48ea4..652a3b93b 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/plugins.sbt @@ -1 +1 @@ -addSbtCoursier +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-assembly/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/sbt-ci-release/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt index 2ba44cb94..789a00e62 100644 --- a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt +++ b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/plugins.sbt @@ -1,2 +1 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.6") -addSbtCoursier diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/sbt-ci-release/project/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/scala-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/scala-jars/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/scala-js/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/scala-js/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/scala-sources-javadoc-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/scala-sources-javadoc-jars/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/semver-reconciliation/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/semver-reconciliation/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/simple/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/simple/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/strict-conflict-manager/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/strict-conflict-manager/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/tests-classifier/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/tests-classifier/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/tests-classifier/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/unidoc/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/unidoc/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/update-sbt-classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/update-sbt-classifiers/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/url/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/url/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/version-interval/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/version-interval/project/plugins.sbt deleted file mode 100644 index 503ac2871..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/version-interval/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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 -} diff --git a/modules/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/version-reconciliation/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/whitespace-resolver/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/whitespace-resolver/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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-2/zookeeper/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt deleted file mode 100644 index 71a44ffd3..000000000 --- a/modules/sbt-coursier/src/sbt-test/shared-2/zookeeper/project/plugins.sbt +++ /dev/null @@ -1,13 +0,0 @@ -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/project/Settings.scala b/project/Settings.scala index 550d67a7e..0bea6b234 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -54,8 +54,6 @@ object Settings { dependencyOverrides := "org.scala-sbt" % "sbt" % targetSbtVersion :: Nil, scriptedLaunchOpts ++= Seq( "-Xmx1024M", - "-Dplugin.name=" + name.value, - "-Dplugin.version=" + version.value, "-Dcoursier.sbt-launcher.add-plugin=true", "-Dcoursier.sbt-launcher.plugin=" + name.value, "-Dcoursier.sbt-launcher.plugin-version=" + version.value