diff --git a/build.sbt b/build.sbt index 557db6a..d50cf63 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ bintrayRepository := "sbt-plugin-releases" bintrayPackage := name.value bintrayReleaseOnPublish := false -crossSbtVersions := Seq("0.13.16", "1.0.1") +crossSbtVersions := Seq("0.13.18", "1.0.4") scriptedSettings scriptedDependencies := publishLocal.value diff --git a/project/build.properties b/project/build.properties index c091b86..8e682c5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 +sbt.version=0.13.18 diff --git a/project/plugins.sbt b/project/plugins.sbt index 208df31..698f2b6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6") +addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value diff --git a/src/main/scala/com/typesafe/sbt/SbtProguard.scala b/src/main/scala/com/typesafe/sbt/SbtProguard.scala index ab70ea3..7d43046 100644 --- a/src/main/scala/com/typesafe/sbt/SbtProguard.scala +++ b/src/main/scala/com/typesafe/sbt/SbtProguard.scala @@ -23,7 +23,7 @@ object SbtProguard extends AutoPlugin { override lazy val projectSettings: Seq[Setting[_]] = inConfig(Proguard)(baseSettings) ++ dependencies def baseSettings: Seq[Setting[_]] = Seq( - proguardVersion := "6.2.2", + proguardVersion := "7.0.0", proguardDirectory := crossTarget.value / "proguard", proguardConfiguration := proguardDirectory.value / "configuration.pro", artifactPath := proguardDirectory.value / (artifactPath in packageBin in Compile).value.getName, @@ -64,6 +64,7 @@ object SbtProguard extends AutoPlugin { } def dependencies: Seq[Setting[_]] = Seq( + resolvers += Resolver.bintrayRepo("guardsquare", "proguard"), libraryDependencies += groupId((proguardVersion in Proguard).value) % "proguard-base" % (proguardVersion in Proguard).value % Proguard )