Merge pull request #102 from eed3si9n/wip/bumpscala

Use sjson-new 0.8.0
sbt · Jul 28, 2017 · 2a53f93 · 2a53f93
2 parents 98a43eb + 7728e29
commit 2a53f93
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -12,7 +12,7 @@ lazy val root = (project in file(".")).
     inThisBuild(List(
       version := "0.3.0-SNAPSHOT",
       organization := "org.scala-sbt",
-      crossScalaVersions := Seq("2.12.2", "2.11.11", "2.10.6"),
+      crossScalaVersions := Seq("2.12.3", "2.11.11", "2.10.6"),
       scalaVersion := "2.10.6",
       organizationName := "sbt",
       organizationHomepage := Some(url("http://scala-sbt.org/")),

diff --git a/plugin/src/main/scala/ContrabandPlugin.scala b/plugin/src/main/scala/ContrabandPlugin.scala
@@ -103,7 +103,7 @@ object ContrabandPlugin extends AutoPlugin {
     )
 
   override def globalSettings = Seq(
-    contrabandSjsonNewVersion := "0.8.0-M4"
+    contrabandSjsonNewVersion := "0.8.0"
   )
 }
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16-M1
+sbt.version=0.13.16