This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new 1e78828d Update sbt-apache-sonatype and handle rename
1e78828d is described below
commit 1e78828d3e41bfb4fb431804b32968498ce64294
Author: Matthew de Detrich <[email protected]>
AuthorDate: Sat May 20 11:36:21 2023 +0200
Update sbt-apache-sonatype and handle rename
---
project/Common.scala | 4 ++--
project/MetaInfLicenseNoticeCopy.scala | 6 +++---
project/plugins.sbt | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/project/Common.scala b/project/Common.scala
index 3e95caf0..ccb157a4 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -15,14 +15,14 @@ import sbt.plugins.JvmPlugin
import org.apache.pekko.grpc.Dependencies.Versions.{ scala212, scala213 }
import
com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys.projectInfoVersion
import com.typesafe.tools.mima.plugin.MimaKeys._
-import org.mdedetrich.apache.sonatype.SonatypeApachePlugin
+import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin
import sbtdynver.DynVerPlugin
import sbtdynver.DynVerPlugin.autoImport.dynverSonatypeSnapshots
object Common extends AutoPlugin {
override def trigger = allRequirements
- override def requires = JvmPlugin && SonatypeApachePlugin && DynVerPlugin
+ override def requires = JvmPlugin && ApacheSonatypePlugin && DynVerPlugin
private val consoleDisabledOptions = Seq("-Xfatal-warnings",
"-Ywarn-unused", "-Ywarn-unused-import")
diff --git a/project/MetaInfLicenseNoticeCopy.scala
b/project/MetaInfLicenseNoticeCopy.scala
index 4bc8b9ca..36d856da 100644
--- a/project/MetaInfLicenseNoticeCopy.scala
+++ b/project/MetaInfLicenseNoticeCopy.scala
@@ -9,8 +9,8 @@
import sbt.Keys._
import sbt._
-import org.mdedetrich.apache.sonatype.SonatypeApachePlugin
-import SonatypeApachePlugin.autoImport.apacheSonatypeDisclaimerFile
+import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin
+import ApacheSonatypePlugin.autoImport.apacheSonatypeDisclaimerFile
/**
* Copies LICENSE and NOTICE files into jar META-INF dir
@@ -19,7 +19,7 @@ object MetaInfLicenseNoticeCopy extends AutoPlugin {
override def trigger = allRequirements
- override def requires = SonatypeApachePlugin
+ override def requires = ApacheSonatypePlugin
override lazy val projectSettings = Seq(
apacheSonatypeDisclaimerFile := Some((LocalRootProject /
baseDirectory).value / "DISCLAIMER"))
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e0a20e2c..3870a9c8 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -16,7 +16,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
-addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.6")
+addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.7")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.5")
// allow access to snapshots for pekko-sbt-paradox
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
