From bb4afb0de41dd26e062a54990f0600334a6f308a Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Jun 2017 20:50:43 +0200 Subject: [PATCH] Move non-project specific settings to buildSettings --- .../main/scala/coursier/CoursierPlugin.scala | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala b/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala index 2ba611d94..9946875a6 100644 --- a/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala +++ b/sbt-coursier/src/main/scala/coursier/CoursierPlugin.scala @@ -82,21 +82,10 @@ object CoursierPlugin extends AutoPlugin { shadedConfigOpt: Option[(String, String)], packageConfigs: Seq[(Configuration, String)] ) = Seq( - coursierParallelDownloads := 6, - coursierMaxIterations := 50, - coursierChecksums := Seq(Some("SHA-1"), None), - coursierArtifactsChecksums := Seq(None), - coursierCachePolicies := CachePolicy.default, - coursierTtl := Cache.defaultTtl, - coursierVerbosity := Settings.defaultVerbosityLevel(sLog.value), - mavenProfiles := Set.empty, coursierResolvers := Tasks.coursierResolversTask.value, coursierRecursiveResolvers := Tasks.coursierRecursiveResolversTask.value, coursierSbtResolvers := externalResolvers.in(updateSbtClassifiers).value, - coursierUseSbtCredentials := true, - coursierCredentials := Map.empty, coursierFallbackDependencies := Tasks.coursierFallbackDependenciesTask.value, - coursierCache := Cache.default, coursierArtifacts := Tasks.artifactFilesOrErrors(withClassifiers = false).value, coursierSignedArtifacts := Tasks.artifactFilesOrErrors(withClassifiers = false, includeSignatures = true).value, coursierClassifiersArtifacts := Tasks.artifactFilesOrErrors( @@ -171,6 +160,20 @@ object CoursierPlugin extends AutoPlugin { } ) + override def buildSettings = super.buildSettings ++ Seq( + coursierParallelDownloads := 6, + coursierMaxIterations := 50, + coursierChecksums := Seq(Some("SHA-1"), None), + coursierArtifactsChecksums := Seq(None), + coursierCachePolicies := CachePolicy.default, + coursierTtl := Cache.defaultTtl, + coursierVerbosity := Settings.defaultVerbosityLevel(sLog.value), + mavenProfiles := Set.empty, + coursierUseSbtCredentials := true, + coursierCredentials := Map.empty, + coursierCache := Cache.default + ) + override lazy val projectSettings = coursierSettings(None, Seq(Compile, Test).map(c => c -> c.name)) ++ inConfig(Compile)(treeSettings) ++ inConfig(Test)(treeSettings)