Merge pull request #13 from hmrc/BDOG-519

Bdog 519
hmrc · Dec 10, 2019 · bf1f439 · bf1f439
2 parents 0c0c27a + 5961356
commit bf1f439
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: scala
 scala:
-- 2.10.7
+- 2.12.10
 jdk:
 - openjdk8
 cache:

diff --git a/README.md b/README.md
@@ -28,12 +28,12 @@ Since major version 6, this plugin is cross compiled for sbt 1.x (specifically 1
 
 | Sbt version | Plugin version |
 | ----------- | -------------- |
-| `<= 0.13.x` | `any`          |
+| `0.13.x`  | `any`          |
 | `>= 1.x`    | `>= 6.x`       |
 
 Add the following to your `project/plugins.sbt`:
 
-```scala
+```
 resolvers += Resolver.url("hmrc-sbt-plugin-releases",
   url("https://dl.bintray.com/hmrc/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
   

diff --git a/build.sbt b/build.sbt
@@ -9,7 +9,7 @@ lazy val root = Project(pluginName, base = file("."))
     majorVersion                     := 6,
     makePublicallyAvailableOnBintray := true,
     organization                     := "uk.gov.hmrc",
-    scalaVersion                     := "2.10.7",   //Pinned to 2.10 while on sbt 0.13 to match ^ cross build inferred version
+    scalaVersion                     := "2.12.10",
     crossSbtVersions                 := Vector("0.13.18", "1.3.4"),
     libraryDependencies              ++=
       Seq(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.18
+sbt.version=1.3.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,8 +3,8 @@ resolvers += Resolver.url("hmrc-sbt-plugin-releases",
 
 resolvers += Resolver.bintrayRepo("hmrc", "releases")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.16.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "2.2.0")
 
 addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "2.0.0")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "0.21.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "1.0.0")