From cb8aba509c208ac7de4d4c3639ecea9e504b0525 Mon Sep 17 00:00:00 2001 From: Faiaz Sanaulla Date: Sat, 14 Jul 2018 15:46:11 +0300 Subject: [PATCH] [SBT][ISSUE-88]: remove hidden dependencies (#89) --- build.sbt | 2 +- project/Dependencies.scala | 9 ++++----- project/Settings.scala | 10 +++++----- version.sbt | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build.sbt b/build.sbt index 73fdf887..82b7ac71 100644 --- a/build.sbt +++ b/build.sbt @@ -119,6 +119,6 @@ lazy val unitTesting = project .settings(Settings.common: _*) .settings( name := "chronicler-unit-testing", - libraryDependencies += Dependencies.scalaTest % Provided + libraryDependencies += Dependencies.scalaTest ) .dependsOn(coreModel % "compile->compile") \ No newline at end of file diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e3039863..267c5cca 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { object Versions { val sttp = "1.1.14" val netty = "4.1.22.Final" - val testing = "0.3.1" + val testing = "0.3.2" object Akka { val akka = "2.5.12" @@ -23,19 +23,18 @@ object Dependencies { } } - val scalaTest = "org.scalatest" %% "scalatest" % Versions.Testing.scalaTest + val scalaTest = "org.scalatest" %% "scalatest" % Versions.Testing.scalaTest val scalaCheck = "org.scalacheck" %% "scalacheck" % Versions.Testing.scalaCheck val httpClientTesting = List( // if, you want to use it by your own, publish this deps from tests library first "com.github.fsanaulla" %% "chronicler-it-testing" % Versions.testing % Scope.it, - "com.github.fsanaulla" %% "chronicler-unit-testing" % Versions.testing % Scope.all, - scalaTest % Scope.all + "com.github.fsanaulla" %% "chronicler-unit-testing" % Versions.testing % Scope.all ) def macroDeps(scalaVersion: String): List[ModuleID] = List( "org.scala-lang" % "scala-reflect" % scalaVersion, - "com.github.fsanaulla" %% "scalacheck-generators" % "0.1.3" % Scope.compileTimeOnly exclude("org.scala-lang", "scala-reflect") + "com.github.fsanaulla" %% "scalacheck-generators" % "0.1.3" % Scope.test exclude("org.scala-lang", "scala-reflect") ) ::: List(scalaTest, scalaCheck).map(_ % Scope.test) // testing diff --git a/project/Settings.scala b/project/Settings.scala index a625726f..f659882d 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -1,8 +1,8 @@ import com.typesafe.sbt.SbtPgp.autoImportImpl.useGpg import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.headerLicense import de.heikoseeberger.sbtheader.License -import sbt.Keys._ -import sbt.librarymanagement.LibraryManagementSyntax +import sbt.Keys.{publishArtifact, _} +import sbt.librarymanagement.{Configurations, LibraryManagementSyntax} import sbt.{Developer, Opts, ScmInfo, url} /** Basic sbt settings */ @@ -31,8 +31,7 @@ object Settings extends LibraryManagementSyntax { url = url(Owner.github) ), parallelExecution in IntegrationTest := false, - publishArtifact in IntegrationTest := false, - publishArtifact in Test := false + makePomConfiguration := makePomConfiguration.value.withConfigurations(Configurations.defaultMavenConfigurations) ) @@ -50,7 +49,8 @@ object Settings extends LibraryManagementSyntax { Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging - ) + ), + publishArtifact in Test := false ) val header = headerLicense := Some(License.ALv2("2017-2018", Owner.name)) diff --git a/version.sbt b/version.sbt index a5b39efd..bd6c2af1 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.3.1" \ No newline at end of file +version in ThisBuild := "0.3.2" \ No newline at end of file