diff options
author | Jakob Odersky <jakob@odersky.com> | 2018-04-15 18:45:21 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2018-04-15 19:56:00 -0700 |
commit | 1ea1164655cdcfbf85869456d33d5bc714c10966 (patch) | |
tree | 4a0a9c633c034d2f94f72daa6e49c96b2000988e | |
parent | 76f235f1cd7a1ab79ef7f31ccd86c604e0f46c96 (diff) | |
download | spray-json-derivation-1ea1164655cdcfbf85869456d33d5bc714c10966.tar.gz spray-json-derivation-1ea1164655cdcfbf85869456d33d5bc714c10966.tar.bz2 spray-json-derivation-1ea1164655cdcfbf85869456d33d5bc714c10966.zip |
Update sbt plugins and fix auto publishingv0.4.2
-rwxr-xr-x | .ci/build | 6 | ||||
-rw-r--r-- | build.sbt | 1 | ||||
-rw-r--r-- | project/build.properties | 2 | ||||
-rw-r--r-- | project/plugins.sbt | 6 |
4 files changed, 8 insertions, 7 deletions
@@ -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", @@ -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") |