diff --git a/build.sh b/build.sh index f8949d977..364fb3be4 100755 --- a/build.sh +++ b/build.sh @@ -62,8 +62,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then fi # default is +publishSigned; we cross-build with travis jobs, not sbt's crossScalaVersions -# re-define pgp files to work around https://github.com/olafurpg/sbt-ci-release/issues/64 -export CI_RELEASE="; set pgpSecretRing := pgpSecretRing.value; set pgpPublicRing := pgpPublicRing.value; $projectPrefix/publishSigned" +export CI_RELEASE="$projectPrefix/publishSigned" export CI_SNAPSHOT_RELEASE="$projectPrefix/publish" # default is sonatypeBundleRelease, which closes and releases the staging repo diff --git a/project/plugins.sbt b/project/plugins.sbt index 7cae141ef..65055033d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28") -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.1") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.4")