Merge pull request #37 from hmrc/PUG-108

PUG-108 migrating domain to new build
hmrc · Dec 17, 2018 · 1ab7817 · 1ab7817
2 parents 4fce1aa + c70ffa7
commit 1ab7817
Show file tree

Hide file tree

Showing 39 changed files with 52 additions and 51 deletions.
diff --git a/project/HmrcBuild.scala b/project/HmrcBuild.scala
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import sbt.Keys._
 import sbt._
+import uk.gov.hmrc.SbtArtifactory.autoImport.makePublicallyAvailableOnBintray
+import uk.gov.hmrc.{SbtArtifactory, SbtAutoBuildPlugin}
+import uk.gov.hmrc.versioning.SbtGitVersioning
+import uk.gov.hmrc.versioning.SbtGitVersioning.autoImport.majorVersion
 
 object HmrcBuild extends Build {
 
-  import uk.gov.hmrc.DefaultBuildSettings._
-  import uk.gov.hmrc.SbtAutoBuildPlugin
-  import uk.gov.hmrc.versioning.SbtGitVersioning
-
   val appDependencies = Seq(
     Dependencies.Compile.playJson,
     Dependencies.Test.scalaTest,
@@ -30,14 +31,12 @@ object HmrcBuild extends Build {
   )
 
   lazy val domain = (project in file("."))
-    .enablePlugins(SbtAutoBuildPlugin, SbtGitVersioning)
+    .enablePlugins(SbtAutoBuildPlugin, SbtGitVersioning, SbtArtifactory)
     .settings(
-      libraryDependencies ++= appDependencies,
-      resolvers := Seq(
-        Resolver.bintrayRepo("hmrc", "releases"),
-        "typesafe-releases" at "http://repo.typesafe.com/typesafe/releases/"
-      )
+      libraryDependencies ++= appDependencies
     )
+    .settings(majorVersion := 5)
+    .settings(makePublicallyAvailableOnBintray := true)
 }
 
 object Dependencies {

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,8 @@
-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"
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.7.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.13.0")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "0.9.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "1.15.0")
+
+addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "0.14.0")
diff --git a/src/main/scala/uk/gov/hmrc/domain/AgentBusinessUtr.scala b/src/main/scala/uk/gov/hmrc/domain/AgentBusinessUtr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/AgentCode.scala b/src/main/scala/uk/gov/hmrc/domain/AgentCode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/AgentUserId.scala b/src/main/scala/uk/gov/hmrc/domain/AgentUserId.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/AtedUtr.scala b/src/main/scala/uk/gov/hmrc/domain/AtedUtr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/AwrsUtr.scala b/src/main/scala/uk/gov/hmrc/domain/AwrsUtr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/CtUtr.scala b/src/main/scala/uk/gov/hmrc/domain/CtUtr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/EmpRef.scala b/src/main/scala/uk/gov/hmrc/domain/EmpRef.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/Generator.scala b/src/main/scala/uk/gov/hmrc/domain/Generator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/ModulusCheck.scala b/src/main/scala/uk/gov/hmrc/domain/ModulusCheck.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/Nino.scala b/src/main/scala/uk/gov/hmrc/domain/Nino.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/Org.scala b/src/main/scala/uk/gov/hmrc/domain/Org.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/PayeAgentReference.scala b/src/main/scala/uk/gov/hmrc/domain/PayeAgentReference.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/PsaId.scala b/src/main/scala/uk/gov/hmrc/domain/PsaId.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/PspId.scala b/src/main/scala/uk/gov/hmrc/domain/PspId.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/SaAgentReference.scala b/src/main/scala/uk/gov/hmrc/domain/SaAgentReference.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/SaUtr.scala b/src/main/scala/uk/gov/hmrc/domain/SaUtr.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/SaUtrGenerator.scala b/src/main/scala/uk/gov/hmrc/domain/SaUtrGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/SimpleObjectFormats.scala b/src/main/scala/uk/gov/hmrc/domain/SimpleObjectFormats.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/TaxCode.scala b/src/main/scala/uk/gov/hmrc/domain/TaxCode.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/Uar.scala b/src/main/scala/uk/gov/hmrc/domain/Uar.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/Vrn.scala b/src/main/scala/uk/gov/hmrc/domain/Vrn.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/taxIdentifiers.scala b/src/main/scala/uk/gov/hmrc/domain/taxIdentifiers.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/domain/taxIds.scala b/src/main/scala/uk/gov/hmrc/domain/taxIds.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/referencechecker/ReferenceChecker.scala b/src/main/scala/uk/gov/hmrc/referencechecker/ReferenceChecker.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/AgentBusinessUtrSpec.scala b/src/test/scala/uk/gov/hmrc/domain/AgentBusinessUtrSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/AtedUtrSpec.scala b/src/test/scala/uk/gov/hmrc/domain/AtedUtrSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/DomainTypeFormatsSpec.scala b/src/test/scala/uk/gov/hmrc/domain/DomainTypeFormatsSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/EmpRefTest.scala b/src/test/scala/uk/gov/hmrc/domain/EmpRefTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/GeneratorSpec.scala b/src/test/scala/uk/gov/hmrc/domain/GeneratorSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/NinoSpec.scala b/src/test/scala/uk/gov/hmrc/domain/NinoSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/PsaIdSpec.scala b/src/test/scala/uk/gov/hmrc/domain/PsaIdSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/PspIdSpec.scala b/src/test/scala/uk/gov/hmrc/domain/PspIdSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/SaUtrGeneratorSpec.scala b/src/test/scala/uk/gov/hmrc/domain/SaUtrGeneratorSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/TaxCodeFormatsSpec.scala b/src/test/scala/uk/gov/hmrc/domain/TaxCodeFormatsSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/TaxCodeSpec.scala b/src/test/scala/uk/gov/hmrc/domain/TaxCodeSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/domain/TaxIdsSpec.scala b/src/test/scala/uk/gov/hmrc/domain/TaxIdsSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/scala/uk/gov/hmrc/referencechecker/ModulusCheckerSpec.scala b/src/test/scala/uk/gov/hmrc/referencechecker/ModulusCheckerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 HM Revenue & Customs
+ * Copyright 2018 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.