diff --git a/build.sbt b/build.sbt index 5f1acd6b..f58669ab 100644 --- a/build.sbt +++ b/build.sbt @@ -32,10 +32,7 @@ inThisBuild( homepage.value.get, "scm:git:git@github.com:zio/zio-sbt.git" ) - ), - pgpPassphrase := sys.env.get("PGP_PASSWORD").map(_.toArray), - pgpPublicRing := file("/tmp/public.asc"), - pgpSecretRing := file("/tmp/secret.asc") + ) ) ) diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/EcosystemPlugin.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/EcosystemPlugin.scala index c35c580a..c0fb7ee2 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/EcosystemPlugin.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/EcosystemPlugin.scala @@ -16,8 +16,9 @@ package zio.sbt -import scala.collection.immutable.ListMap +import com.jsuereth.sbtpgp.SbtPgp.autoImport.{pgpPassphrase, pgpPublicRing, pgpSecretRing} +import scala.collection.immutable.ListMap import org.scalafmt.sbt.ScalafmtPlugin import sbt.Keys.* import sbt.{Def, *} @@ -366,11 +367,14 @@ object EcosystemPlugin extends AutoPlugin { override def globalSettings: Seq[Def.Setting[_]] = super.globalSettings ++ Seq( - scala3 := Defaults.scala3, - scala211 := Defaults.scala211, - scala212 := Defaults.scala212, - scala213 := Defaults.scala213, - scalaVersion := Defaults.scala213, - licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")) + scala3 := Defaults.scala3, + scala211 := Defaults.scala211, + scala212 := Defaults.scala212, + scala213 := Defaults.scala213, + scalaVersion := Defaults.scala213, + licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), + pgpPassphrase := sys.env.get("PGP_PASSPHRASE").map(_.toArray), + pgpPublicRing := file("/tmp/public.asc"), + pgpSecretRing := file("/tmp/secret.asc") ) }