Skip to content

Commit fb1e4a3

Browse files
authored
Merge pull request #358 from lrytz/ci-release-update
update module plugin to 2.1.2, remove workaround
2 parents 499f8e1 + 0c03833 commit fb1e4a3

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

build.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
6262
fi
6363
6464
# default is +publishSigned; we cross-build with travis jobs, not sbt's crossScalaVersions
65-
# re-define pgp files to work around https://github.com/olafurpg/sbt-ci-release/issues/64
66-
export CI_RELEASE="; set pgpSecretRing := pgpSecretRing.value; set pgpPublicRing := pgpPublicRing.value; $projectPrefix/publishSigned"
65+
export CI_RELEASE="$projectPrefix/publishSigned"
6766
export CI_SNAPSHOT_RELEASE="$projectPrefix/publish"
6867
6968
# default is sonatypeBundleRelease, which closes and releases the staging repo

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
val scalaJSVersion =
22
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
33

4-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.1")
4+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.2")
55
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
66
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
77
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.4")

0 commit comments

Comments
 (0)