From 2ff8c07a17085152183b98b068448148dcf1ed73 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 23 May 2023 18:34:30 +0100 Subject: [PATCH] remove rsync plugin (#331) --- build.sbt | 2 -- project/Doc.scala | 8 -------- project/Paradox.scala | 7 +------ project/Publish.scala | 2 -- project/plugins.sbt | 1 - 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/build.sbt b/build.sbt index b5a732416a..9a6ccbba21 100644 --- a/build.sbt +++ b/build.sbt @@ -89,7 +89,6 @@ lazy val aggregatedProjects: Seq[ProjectReference] = userProjects ++ List[Projec lazy val root = Project(id = "pekko", base = file(".")) .aggregate(aggregatedProjects: _*) - .enablePlugins(PublishRsyncPlugin) .settings( name := "pekko-root") .settings(rootSettings: _*) @@ -244,7 +243,6 @@ lazy val docs = pekkoModule("docs") .enablePlugins( ParadoxPlugin, PekkoParadoxPlugin, - PublishRsyncPlugin, NoPublish, ParadoxBrowse, ScaladocNoVerificationOfDiagrams, diff --git a/project/Doc.scala b/project/Doc.scala index 0ed8ee4bf6..252b6d3180 100644 --- a/project/Doc.scala +++ b/project/Doc.scala @@ -21,7 +21,6 @@ import sbtunidoc.GenJavadocPlugin.autoImport._ import sbt.Keys._ import sbt.File import scala.annotation.tailrec -import com.lightbend.sbt.publishrsync.PublishRsyncPlugin.autoImport.publishRsyncArtifacts import sbt.ScopeFilter.ProjectFilter @@ -153,13 +152,6 @@ object UnidocRoot extends AutoPlugin { JavaUnidoc / unidoc / javacOptions := { if (JdkOptions.isJdk8) Seq("-Xdoclint:none") else Seq("-Xdoclint:none", "--ignore-source-errors", "--no-module-directories") - }, - publishRsyncArtifacts ++= { - val releaseVersion = if (isSnapshot.value) "snapshot" else version.value - (Compile / unidoc).value match { - case Seq(japi, api) => - Seq(japi -> s"www/japi/pekko/$releaseVersion", api -> s"www/api/pekko/$releaseVersion") - } })) .getOrElse(Nil) diff --git a/project/Paradox.scala b/project/Paradox.scala index bcd6c5435d..83e65813b9 100644 --- a/project/Paradox.scala +++ b/project/Paradox.scala @@ -16,7 +16,6 @@ package org.apache.pekko import com.lightbend.paradox.sbt.ParadoxPlugin import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport._ import com.lightbend.paradox.apidoc.ApidocPlugin -import com.lightbend.sbt.publishrsync.PublishRsyncPlugin.autoImport._ import org.apache.pekko.PekkoParadoxPlugin.autoImport._ import sbt.Keys._ import sbt._ @@ -110,9 +109,5 @@ object Paradox { Seq( Compile / paradox / name := "Pekko", resolvers += Resolver.jcenterRepo, - ApidocPlugin.autoImport.apidocRootPackage := "org.apache.pekko", - publishRsyncArtifacts += { - val releaseVersion = if (isSnapshot.value) "snapshot" else version.value - (Compile / paradox).value -> s"www/docs/pekko/$releaseVersion" - }) + ApidocPlugin.autoImport.apidocRootPackage := "org.apache.pekko") } diff --git a/project/Publish.scala b/project/Publish.scala index 132a194ce1..b7651b0e3b 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -15,7 +15,6 @@ package org.apache.pekko import sbt._ import sbt.Keys._ -import com.lightbend.sbt.publishrsync.PublishRsyncPlugin.autoImport.publishRsyncHost import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin import sbtdynver.DynVerPlugin import sbtdynver.DynVerPlugin.autoImport.dynverSonatypeSnapshots @@ -25,7 +24,6 @@ object Publish extends AutoPlugin { override def trigger = allRequirements override lazy val projectSettings = Seq( - publishRsyncHost := "akkarepo@gustav.akka.io", startYear := Some(2022), developers := List( Developer( diff --git a/project/plugins.sbt b/project/plugins.sbt index 0d803df5e9..0ff99cf194 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -18,7 +18,6 @@ addSbtPlugin("com.hpe.sbt" % "sbt-pull-request-validator" % "1.0.0") 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.8") addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.2.2")