diff --git a/project/FrontendBuild.scala b/project/FrontendBuild.scala index 56982b9..dbc45d6 100644 --- a/project/FrontendBuild.scala +++ b/project/FrontendBuild.scala @@ -17,11 +17,8 @@ import sbt._ object FrontendBuild extends Build with MicroService { - import scala.util.Properties.envOrElse val appName = "fset-fasttrack-frontend" - val appVersion = envOrElse("FSET_FASTTRACK_FRONTEND_VERSION", "999-SNAPSHOT") - override lazy val appDependencies: Seq[ModuleID] = AppDependencies() } @@ -34,7 +31,6 @@ private object AppDependencies { import Versions._ import play.sbt.PlayImport._ - val compile = Seq( "com.iheart" %% "ficus" % "1.2.6", "uk.gov.hmrc" %% "http-caching-client" % "7.0.0", diff --git a/project/MicroService.scala b/project/MicroService.scala index 7ab6f59..6e9624f 100644 --- a/project/MicroService.scala +++ b/project/MicroService.scala @@ -27,12 +27,13 @@ import play.sbt.PlayImport._ import uk.gov.hmrc.sbtdistributables.SbtDistributablesPlugin import uk.gov.hmrc.sbtdistributables.SbtDistributablesPlugin._ import uk.gov.hmrc.versioning.SbtGitVersioning +import uk.gov.hmrc.versioning.SbtGitVersioning.autoImport.majorVersion import play.sbt.routes.RoutesKeys.routesGenerator trait MicroService { import uk.gov.hmrc._ - import DefaultBuildSettings._ + import DefaultBuildSettings.{addTestReportOption, defaultSettings, scalaSettings, targetJvm} import TestPhases._ import uk.gov.hmrc.sbtdistributables.SbtDistributablesPlugin._ @@ -42,13 +43,14 @@ trait MicroService { val appDependencies : Seq[ModuleID] lazy val plugins : Seq[Plugins] = Seq(play.sbt.PlayScala, - SbtWeb, SbtAutoBuildPlugin, SbtGitVersioning, SbtDistributablesPlugin) + SbtWeb, SbtAutoBuildPlugin, SbtGitVersioning, SbtDistributablesPlugin, SbtArtifactory) lazy val playSettings : Seq[Setting[_]] = Seq(routesImport ++= Seq("binders.CustomBinders._", "models._")) lazy val compileScalastyle = taskKey[Unit]("compileScalastyle") lazy val microservice = Project(appName, file(".")) .enablePlugins(plugins : _*) + .settings(majorVersion := 1) .settings(playSettings : _*) .settings(scalaSettings: _*) .settings(publishingSettings ++ (publishArtifact in(Compile, packageDoc) := false)) diff --git a/project/plugins.sbt b/project/plugins.sbt index e9845ae..34376dc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,23 +1,28 @@ -credentials += Credentials(Path.userHome / ".sbt" / ".credentials") +resolvers ++= Seq( + Resolver.url("HMRC Sbt Plugin Releases", url("https://dl.bintray.com/hmrc/sbt-plugin-releases"))(Resolver.ivyStylePatterns), + "HMRC Releases" at "https://dl.bintray.com/hmrc/releases", + "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/" +) -resolvers += Resolver.url("hmrc-sbt-plugin-releases", - url("https://dl.bintray.com/hmrc/sbt-plugin-releases"))(Resolver.ivyStylePatterns) +addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "0.13.0") -resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/" +addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.13.0") -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.7.0") +addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "1.1.0") -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.12") +addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "1.15.0") + +addSbtPlugin("uk.gov.hmrc" % "sbt-settings" % "3.8.0") addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.0.0") addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.0") -addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.7.0") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.12") + +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") + -addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "1.0.0") -addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "0.9.0") -addSbtPlugin("uk.gov.hmrc" % "sbt-settings" % "3.4.0")