raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Update sbt-apache-sonatype and handle rename

Browse source
This commit is contained in:
Matthew de Detrich 2023-05-20 11:11:40 +02:00 • committed by Matthew de Detrich
parent 5dbc32b552
commit 7809c78388
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
project/AddMetaInfLicenseFiles.scala
View file

@ -9,8 +9,8 @@
import sbt.Keys._
import sbt._
import org.mdedetrich.apache.sonatype.SonatypeApachePlugin
import org.mdedetrich.apache.sonatype.SonatypeApachePlugin.autoImport._
import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin
import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin.autoImport._
/**
* Copies LICENSE and NOTICE files into jar META-INF dir
@ -53,7 +53,7 @@ object AddMetaInfLicenseFiles extends AutoPlugin {
resourceGenerators += {
Def.task {
List(
SonatypeApachePlugin.addFileToMetaInf(resourceManaged.value, baseDir.value / "COPYING.protobuf"))
ApacheSonatypePlugin.addFileToMetaInf(resourceManaged.value, baseDir.value / "COPYING.protobuf"))
}
}))
@ -67,11 +67,11 @@ object AddMetaInfLicenseFiles extends AutoPlugin {
resourceGenerators += {
Def.task {
List(
SonatypeApachePlugin.addFileToMetaInf(resourceManaged.value, baseDir.value / "COPYING.protobuf"))
ApacheSonatypePlugin.addFileToMetaInf(resourceManaged.value, baseDir.value / "COPYING.protobuf"))
}
}))
override def trigger = allRequirements
override def requires = SonatypeApachePlugin
override def requires = ApacheSonatypePlugin
}

4
project/Publish.scala
View file

@ -16,7 +16,7 @@ package org.apache.pekko
import sbt._
import sbt.Keys._
import com.lightbend.sbt.publishrsync.PublishRsyncPlugin.autoImport.publishRsyncHost
import org.mdedetrich.apache.sonatype.SonatypeApachePlugin
import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin
import sbtdynver.DynVerPlugin
import sbtdynver.DynVerPlugin.autoImport.dynverSonatypeSnapshots
@ -37,7 +37,7 @@ object Publish extends AutoPlugin {
override lazy val buildSettings = Seq(
dynverSonatypeSnapshots := true)
override def requires = SonatypeApachePlugin && DynVerPlugin
override def requires = ApacheSonatypePlugin && DynVerPlugin
}
/**

2
project/plugins.sbt
View file

@ -20,7 +20,7 @@ addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.5")
addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.6")
addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.7")
addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.2.2")
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.5.0")