aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/build6
-rw-r--r--build.sbt1
-rw-r--r--project/build.properties2
-rw-r--r--project/plugins.sbt6
4 files changed, 8 insertions, 7 deletions
diff --git a/.ci/build b/.ci/build
index a6c6ec0..1c8e832 100755
--- a/.ci/build
+++ b/.ci/build
@@ -15,9 +15,9 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then
# Set up publishing settings and credentials
cat <<EOF > credentials.sbt
- useGpg := true
- pgpSigningKey := Some(0x488F99C904F077E8l)
- credentials += Credentials(
+ useGpg in Global := true
+ pgpSigningKey in Global := Some(0x488F99C904F077E8l)
+ credentials in Global += Credentials(
"Sonatype Nexus Repository Manager",
"oss.sonatype.org",
"vZKBpUCV",
diff --git a/build.sbt b/build.sbt
index a13dab1..9f99ddb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -36,6 +36,7 @@ lazy val sprayJsonDerivation =
)
.nativeSettings(
crossScalaVersions := "2.11.12" :: Nil,
+ sources in (Compile, doc) := Seq.empty,
unmanagedSourceDirectories in Test := Seq.empty
)
diff --git a/project/build.properties b/project/build.properties
index 31334bb..0531343 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=1.1.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index dffcdb8..d983863 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,7 +2,7 @@ ivyLoggingLevel := UpdateLogging.Quiet
addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.2.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.4.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
-addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.3.1")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.1")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.6")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.7")