From 783a8e57dbe389411f478a0e88a083b1da3eb843 Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Mon, 12 Jun 2023 18:06:06 +0200
Subject: [PATCH] Fix #7288 and implement publisM2 / skip

---
 main/src/main/scala/sbt/Defaults.scala | 73 +++++++++-----------------
 1 file changed, 25 insertions(+), 48 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 3011f79ba..cd908de60 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -2622,7 +2622,8 @@ object Defaults extends BuildCommon {
         if (turbo.value) ClassLoaderLayeringStrategy.AllLibraryJars
         else ClassLoaderLayeringStrategy.ScalaLibrary
       },
-      publishLocal / skip := (publish / skip).value, // So we don't break previous behaviour
+      publishLocal / skip := (publish / skip).value,
+      publishM2 / skip := (publish / skip).value
     )
   // build.sbt is treated a Scala source of metabuild, so to enable deprecation flag on build.sbt we set the option here.
   lazy val deprecationSettings: Seq[Setting[_]] =
@@ -2911,9 +2912,9 @@ object Classpaths {
     deliver := deliverTask(makeIvyXmlConfiguration).value,
     deliverLocal := deliverTask(makeIvyXmlLocalConfiguration).value,
     makeIvyXml := deliverTask(makeIvyXmlConfiguration).value,
-    publish := publishTask(publishConfiguration).value,
-    publishLocal := publishTask(publishLocalConfiguration).value,
-    publishM2 := publishTask(publishM2Configuration).value
+    publish := publishOrSkip(publishConfiguration, publish / skip).value,
+    publishLocal := publishOrSkip(publishLocalConfiguration, publishLocal / skip).value,
+    publishM2 := publishOrSkip(publishM2Configuration, publishM2 / skip).value
   )
 
   private[this] def baseGlobalDefaults =
@@ -3617,56 +3618,32 @@ object Classpaths {
   private def logSkipPublish(log: Logger, ref: ProjectRef): Unit =
     log.debug(s"Skipping publish* for ${ref.project}")
 
-  private def checkAndPublishLocal(
-      currentCon: PublishConfiguration,
-      publishLocalConf: PublishConfiguration,
-      publishSkipLocal: Boolean,
-      module: IvySbt#Module,
-      log: Logger,
-      ref: ProjectRef
-  )(notPublishLocal: () => Unit): Unit = {
-    if (currentCon == publishLocalConf) {
-      if (publishSkipLocal) {
-        logSkipPublish(log, ref)
-      } else {
-        IvyActions.publish(module, currentCon, log)
-      }
-    } else {
-      notPublishLocal()
-    }
+  @deprecated("use publishOrSkip instead", "1.9.1")
+  def publishTask(config: TaskKey[PublishConfiguration]): Initialize[Task[Unit]] = {
+    val skipKey =
+      if (config.key == publishLocalConfiguration.key) publishLocal / skip
+      else publish / skip
+    publishOrSkip(config, skipKey)
   }
 
-  def publishTask(config: TaskKey[PublishConfiguration]): Initialize[Task[Unit]] =
-    Def.taskIf {
-      if ((publish / skip).value) {
-        val log = streams.value.log
-        val ref = thisProjectRef.value
-        checkAndPublishLocal(
-          config.value,
-          publishLocalConfiguration.value,
-          (publishLocal / skip).value,
-          ivyModule.value,
-          log,
-          ref
-        ) { () =>
+  def publishOrSkip(
+      config: TaskKey[PublishConfiguration],
+      skip: TaskKey[Boolean]
+  ): Initialize[Task[Unit]] =
+    Def
+      .taskIf {
+        if (skip.value) {
+          val log = streams.value.log
+          val ref = thisProjectRef.value
           logSkipPublish(log, ref)
-        }
-      } else {
-        val conf = config.value
-        val log = streams.value.log
-        val module = ivyModule.value
-        checkAndPublishLocal(
-          conf,
-          publishLocalConfiguration.value,
-          (publishLocal / skip).value,
-          module,
-          log,
-          thisProjectRef.value
-        ) { () =>
+        } else {
+          val conf = config.value
+          val log = streams.value.log
+          val module = ivyModule.value
           IvyActions.publish(module, conf, log)
         }
       }
-    } tag (Tags.Publish, Tags.Network)
+      .tag(Tags.Publish, Tags.Network)
 
   val moduleIdJsonKeyFormat: sjsonnew.JsonKeyFormat[ModuleID] =
     new sjsonnew.JsonKeyFormat[ModuleID] {