Skip to content

Commit

Permalink
Merge pull request #52 from hmrc/APIS-MIGRATE
Browse files Browse the repository at this point in the history
APIS-MIGRATE
  • Loading branch information
d6fb authored Sep 7, 2018
2 parents 3371e5d + fce4f6b commit b32d6f6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ lazy val IntegrationTest = config("it") extend Test
val testConfig = Seq(AcceptanceTest, Test, IntegrationTest)

lazy val microservice = Project(appName, file("."))
.enablePlugins(Seq(PlayScala, SbtAutoBuildPlugin, SbtGitVersioning, SbtDistributablesPlugin) ++ plugins: _*)
.enablePlugins(Seq(PlayScala, SbtAutoBuildPlugin, SbtGitVersioning, SbtDistributablesPlugin, SbtArtifactory) ++ plugins: _*)
.configs(testConfig: _*)
.settings(playSettings: _*)
.settings(scalaSettings: _*)
Expand All @@ -80,7 +80,9 @@ lazy val microservice = Project(appName, file("."))
unmanagedSourceDirectories in IntegrationTest <<= (baseDirectory in IntegrationTest) (base => Seq(base / "test" / "it")),
addTestReportOption(IntegrationTest, "integration-reports"),
testGrouping in IntegrationTest := oneForkedJvmPerTest((definedTests in IntegrationTest).value),
parallelExecution in IntegrationTest := false)
parallelExecution in IntegrationTest := false
)
.settings(majorVersion := 0)

lazy val unitTestSettings =
inConfig(Test)(Defaults.testSettings) ++
Expand Down
8 changes: 5 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
resolvers += Resolver.url("hmrc-sbt-plugin-releases", url("https://dl.bintray.com/hmrc/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
resolvers += Resolver.url("HMRC Sbt Plugin Releases", url("https://dl.bintray.com/hmrc/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
resolvers += "HMRC Releases" at "https://dl.bintray.com/hmrc/releases"

resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/"

addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.12.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "0.10.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.13.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "1.14.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "1.1.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "0.13.0")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.12")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")

0 comments on commit b32d6f6

Please sign in to comment.