summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxuwei-k <6b656e6a69@gmail.com>2018-01-08 14:56:25 +0900
committerxuwei-k <6b656e6a69@gmail.com>2018-04-01 20:49:56 +0900
commit7971295de81e5ee06fa1d9d8784b5c15c7fc6e9a (patch)
tree9948a8bc4a3f519069357ce6d795ec7a861204da
parent216fae2a934719179a91d60de0a251dbe84682ea (diff)
downloadspray-json-7971295de81e5ee06fa1d9d8784b5c15c7fc6e9a.tar.gz
spray-json-7971295de81e5ee06fa1d9d8784b5c15c7fc6e9a.tar.bz2
spray-json-7971295de81e5ee06fa1d9d8784b5c15c7fc6e9a.zip
sbt 1.1.2
-rw-r--r--.travis.yml2
-rw-r--r--build.sbt4
-rw-r--r--project/build.properties2
-rw-r--r--project/plugins.sbt6
4 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 735975f..cfab53f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ scala:
- 2.12.4
- 2.13.0-M3
script:
- - sbt ++$TRAVIS_SCALA_VERSION test mimaReportBinaryIssues
+ - sbt "++ ${TRAVIS_SCALA_VERSION}!" test mimaReportBinaryIssues
jdk:
- oraclejdk8
notifications:
diff --git a/build.sbt b/build.sbt
index 3dd9164..298ddeb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -47,10 +47,10 @@ libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
(scalacOptions in doc) ++= Seq("-doc-title", name.value + " " + version.value)
// generate boilerplate
-Boilerplate.settings
+enablePlugins(BoilerplatePlugin)
// OSGi settings
-osgiSettings
+enablePlugins(SbtOsgi)
OsgiKeys.exportPackage := Seq("""spray.json.*;version="${Bundle-Version}"""")
diff --git a/project/build.properties b/project/build.properties
index c091b86..0531343 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.1.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b6edd90..b687503 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,7 @@
-addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.9")
+addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")