Skip to content

Commit

Permalink
[SBT][ISSUE-88]: remove hidden dependencies (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
fsanaulla authored Jul 14, 2018
1 parent cf36457 commit cb8aba5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
9 changes: 4 additions & 5 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions project/Settings.scala
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down Expand Up @@ -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)
)


Expand All @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.3.1"
version in ThisBuild := "0.3.2"

0 comments on commit cb8aba5

Please sign in to comment.