diff --git a/build.sbt b/build.sbt index 92f9349a1..d4f875a13 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ import scala.util.Try // ThisBuild settings take lower precedence, // but can be shared across the multi projects. ThisBuild / version := { - val v = "1.12.0-SNAPSHOT" + val v = "1.12.3-SNAPSHOT" nightlyVersion.getOrElse(v) } ThisBuild / version2_13 := "2.0.0-SNAPSHOT" @@ -57,6 +57,9 @@ Global / excludeLint += checkPluginCross Global / excludeLint += nativeImageJvm Global / excludeLint += nativeImageVersion +usePgpKeyHex("642AC823") +// usePgpKeyHex("2BE67AC00D699E04E840B7FE29967E804D85663F") + def commonBaseSettings: Seq[Setting[_]] = Def.settings( headerLicense := Some( HeaderLicense.Custom( diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index 0f1acb466..14df0ffc8 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -101,7 +101,6 @@ val launcherPackage = (project in file(".")). case _ => Nil } }, - usePgpKeyHex("642AC823"), pgpSecretRing := file(s"""${sys.props("user.home")}""") / ".ssh" / "scalasbt.key", pgpPublicRing := file(s"""${sys.props("user.home")}""") / ".ssh" / "scalasbt.pub", publishToSettings, diff --git a/sbt b/sbt index df41a9ddb..461037385 100755 --- a/sbt +++ b/sbt @@ -1,7 +1,7 @@ #!/usr/bin/env bash set +e -declare builtin_sbt_version="1.12.1" +declare builtin_sbt_version="1.12.2" declare -a residual_args declare -a java_args declare -a scalac_args