Upgrade to sbt 1.0.4

xerial · xerial · commit bccc1e1b0c8f · 2017-11-28T22:09:29.000-08:00
diff --git a/build.sbt b/build.sbt
@@ -1,26 +1,26 @@
-import de.johoop.findbugs4sbt.ReportType
 import ReleaseTransformations._
 
-val buildSettings = findbugsSettings ++ jacoco.settings ++ osgiSettings ++ Seq[Setting[_]](
+val buildSettings = Seq[Setting[_]](
   organization := "org.msgpack",
   organizationName := "MessagePack",
   organizationHomepage := Some(new URL("http://msgpack.org/")),
   description := "MessagePack for Java",
-  scalaVersion := "2.11.11",
+  scalaVersion := "2.12.4",
   logBuffered in Test := false,
+  // msgpack-java should be a pure-java library, so remove Scala specific configurations
   autoScalaLibrary := false,
   crossPaths := false,
   // For performance testing, ensure each test run one-by-one
   concurrentRestrictions in Global := Seq(
     Tags.limit(Tags.Test, 1)
   ),
   // JVM options for building
-  scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-target:jvm-1.6", "-feature"),
+  scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-target:jvm-1.7", "-feature"),
   javaOptions in Test ++= Seq("-ea"),
-  javacOptions in (Compile, compile) ++= Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation", "-source", "1.6", "-target", "1.6"),
+  javacOptions in (Compile, compile) ++= Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation", "-source", "1.7", "-target", "1.7"),
   // Use lenient validation mode when generating Javadoc (for Java8)
   javacOptions in doc := {
-    val opts = Seq("-source", "1.6")
+    val opts = Seq("-source", "1.7")
     if (scala.util.Properties.isJavaAtLeast("1.8")) {
       opts ++ Seq("-Xdoclint:none")
     }
@@ -38,18 +38,15 @@ val buildSettings = findbugsSettings ++ jacoco.settings ++ osgiSettings ++ Seq[S
           setReleaseVersion,
           commitReleaseVersion,
           tagRelease,
-          ReleaseStep(action = Command.process("publishSigned", _)),
+          releaseStepCommand("publishSigned"),
           setNextVersion,
           commitNextVersion,
-          ReleaseStep(action = Command.process("sonatypeReleaseAll", _)),
+          releaseStepCommand("sonatypeReleaseAll"),
           pushChanges
         ),
   
-  // Jacoco code coverage report
-  parallelExecution in jacoco.Config := false,
-  
   // Find bugs
-  findbugsReportType := Some(ReportType.FancyHtml),
+  findbugsReportType := Some(FindbugsReport.FancyHtml),
   findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html"),
   
   // Style check config: (sbt-jchekcstyle)
@@ -76,6 +73,7 @@ lazy val root = Project(id = "msgpack-java", base = file("."))
         ).aggregate(msgpackCore, msgpackJackson)
 
 lazy val msgpackCore = Project(id = "msgpack-core", base = file("msgpack-core"))
+     .enablePlugins(SbtOsgi)
         .settings(
           buildSettings,
           description := "Core library of the MessagePack for Java",
@@ -96,11 +94,12 @@ lazy val msgpackCore = Project(id = "msgpack-core", base = file("msgpack-core"))
             "org.xerial" %% "xerial-core" % "3.6.0" % "test",
             "org.msgpack" % "msgpack" % "0.6.12" % "test",
             "commons-codec" % "commons-codec" % "1.10" % "test",
-            "com.typesafe.akka" %% "akka-actor" % "2.3.16" % "test"
+            "com.typesafe.akka" %% "akka-actor" % "2.5.7" % "test"
           )
         )
 
 lazy val msgpackJackson = Project(id = "msgpack-jackson", base = file("msgpack-jackson"))
+     .enablePlugins(SbtOsgi)
         .settings(
           buildSettings,
           name := "jackson-dataformat-msgpack",
diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=0.13.15
+sbt.version=1.0.4
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,16 +1,12 @@
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("com.github.sbt" % "sbt-findbugs" % "2.0.0")
+addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.0.3")
+addSbtPlugin("org.xerial.sbt" % "sbt-jcheckstyle" % "0.2.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2")
+addSbtPlugin("io.get-coursier"   % "sbt-coursier"             % "1.0.0-RC12")
+addSbtPlugin("com.geirsson"      % "sbt-scalafmt"             % "1.3.0")
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0")
-
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
-
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-
-addSbtPlugin("de.johoop" % "findbugs4sbt" % "1.3.0")
-
-addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.1.6")
-
-addSbtPlugin("org.xerial.sbt" % "sbt-jcheckstyle" % "0.1.4")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
 
 scalacOptions ++= Seq("-deprecation", "-feature")

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-sbt.version=0.13.15`
	`1`	`+sbt.version=1.0.4`
`2`	`2`