Merge pull request #2 from Dwolla/upstream-deps

update sbt-native-packager to 1.1.4 because docker deprecated the -f …
Dwolla · Sep 20, 2016 · 8d7b6d1 · 8d7b6d1
2 parents 0e82409 + b570cbe
commit 8d7b6d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,4 +16,3 @@ deploy:
   script: sbt publish
   on:
     branch: master
-
diff --git a/build.sbt b/build.sbt
@@ -1,15 +1,15 @@
 import java.lang.System._
 
 lazy val buildVersion = {
-  val mainVersion = "1.1"
+  val mainVersion = "1.2"
   val minorVersion = Option(getenv("TRAVIS_BUILD_NUMBER"))
   minorVersion match {
     case Some(v: String) ⇒ s"$mainVersion.$v"
     case None ⇒ mainVersion + "-SNAPSHOT"
   }
 }
 
-lazy val specs2Version = "3.6.6"
+lazy val specs2Version = "3.8.5"
 
 lazy val buildSettings = Seq(
   organization := "com.dwolla.sbt",
@@ -35,7 +35,7 @@ lazy val bintraySettings = Seq(
   pomIncludeRepository := { _ ⇒ false }
 )
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.6")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4")
 
 lazy val pipeline = InputKey[Unit]("pipeline", "Runs the full build pipeline: compile, test, integration tests")
 pipeline := scripted.dependsOn(test in Test).evaluated

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 0.13.11
+sbt.version = 0.13.12
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,3 @@ deploy:
		script: sbt publish
		on:
		branch: master