|
1 | | -import de.johoop.findbugs4sbt.ReportType |
2 | 1 | import ReleaseTransformations._ |
3 | 2 |
|
4 | | -val buildSettings = findbugsSettings ++ jacoco.settings ++ osgiSettings ++ Seq[Setting[_]]( |
| 3 | +val buildSettings = Seq[Setting[_]]( |
5 | 4 | organization := "org.msgpack", |
6 | 5 | organizationName := "MessagePack", |
7 | 6 | organizationHomepage := Some(new URL("http://msgpack.org/")), |
8 | 7 | description := "MessagePack for Java", |
9 | | - scalaVersion := "2.11.11", |
| 8 | + scalaVersion := "2.12.4", |
10 | 9 | logBuffered in Test := false, |
| 10 | + // msgpack-java should be a pure-java library, so remove Scala specific configurations |
11 | 11 | autoScalaLibrary := false, |
12 | 12 | crossPaths := false, |
13 | 13 | // For performance testing, ensure each test run one-by-one |
14 | 14 | concurrentRestrictions in Global := Seq( |
15 | 15 | Tags.limit(Tags.Test, 1) |
16 | 16 | ), |
17 | 17 | // JVM options for building |
18 | | - scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-target:jvm-1.6", "-feature"), |
| 18 | + scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-target:jvm-1.7", "-feature"), |
19 | 19 | javaOptions in Test ++= Seq("-ea"), |
20 | | - javacOptions in (Compile, compile) ++= Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation", "-source", "1.6", "-target", "1.6"), |
| 20 | + javacOptions in (Compile, compile) ++= Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation", "-source", "1.7", "-target", "1.7"), |
21 | 21 | // Use lenient validation mode when generating Javadoc (for Java8) |
22 | 22 | javacOptions in doc := { |
23 | | - val opts = Seq("-source", "1.6") |
| 23 | + val opts = Seq("-source", "1.7") |
24 | 24 | if (scala.util.Properties.isJavaAtLeast("1.8")) { |
25 | 25 | opts ++ Seq("-Xdoclint:none") |
26 | 26 | } |
@@ -38,18 +38,15 @@ val buildSettings = findbugsSettings ++ jacoco.settings ++ osgiSettings ++ Seq[S |
38 | 38 | setReleaseVersion, |
39 | 39 | commitReleaseVersion, |
40 | 40 | tagRelease, |
41 | | - ReleaseStep(action = Command.process("publishSigned", _)), |
| 41 | + releaseStepCommand("publishSigned"), |
42 | 42 | setNextVersion, |
43 | 43 | commitNextVersion, |
44 | | - ReleaseStep(action = Command.process("sonatypeReleaseAll", _)), |
| 44 | + releaseStepCommand("sonatypeReleaseAll"), |
45 | 45 | pushChanges |
46 | 46 | ), |
47 | 47 |
|
48 | | - // Jacoco code coverage report |
49 | | - parallelExecution in jacoco.Config := false, |
50 | | - |
51 | 48 | // Find bugs |
52 | | - findbugsReportType := Some(ReportType.FancyHtml), |
| 49 | + findbugsReportType := Some(FindbugsReport.FancyHtml), |
53 | 50 | findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html"), |
54 | 51 |
|
55 | 52 | // Style check config: (sbt-jchekcstyle) |
@@ -76,6 +73,7 @@ lazy val root = Project(id = "msgpack-java", base = file(".")) |
76 | 73 | ).aggregate(msgpackCore, msgpackJackson) |
77 | 74 |
|
78 | 75 | lazy val msgpackCore = Project(id = "msgpack-core", base = file("msgpack-core")) |
| 76 | + .enablePlugins(SbtOsgi) |
79 | 77 | .settings( |
80 | 78 | buildSettings, |
81 | 79 | description := "Core library of the MessagePack for Java", |
@@ -96,11 +94,12 @@ lazy val msgpackCore = Project(id = "msgpack-core", base = file("msgpack-core")) |
96 | 94 | "org.xerial" %% "xerial-core" % "3.6.0" % "test", |
97 | 95 | "org.msgpack" % "msgpack" % "0.6.12" % "test", |
98 | 96 | "commons-codec" % "commons-codec" % "1.10" % "test", |
99 | | - "com.typesafe.akka" %% "akka-actor" % "2.3.16" % "test" |
| 97 | + "com.typesafe.akka" %% "akka-actor" % "2.5.7" % "test" |
100 | 98 | ) |
101 | 99 | ) |
102 | 100 |
|
103 | 101 | lazy val msgpackJackson = Project(id = "msgpack-jackson", base = file("msgpack-jackson")) |
| 102 | + .enablePlugins(SbtOsgi) |
104 | 103 | .settings( |
105 | 104 | buildSettings, |
106 | 105 | name := "jackson-dataformat-msgpack", |
|