Revert "Add PublishCredentialsModule, MavenPublish and MavenPublishModule (#6023)"

This reverts commit 6d9f383.

Author: lihaoyi

libs/javalib/src/mill/javalib/MavenPublish.scala

@@ -1,30 +1,29 @@
 package mill.javalib
 
 import com.lihaoyi.unroll
-import com.lumidion.sonatype.central.client.core.PublishingType
-import com.lumidion.sonatype.central.client.core.SonatypeCredentials
+import com.lumidion.sonatype.central.client.core.{PublishingType, SonatypeCredentials}
 import mill.*
-import mill.api.BuildCtx
+import javalib.*
+import mill.api.{ExternalModule, Task}
+import mill.util.Tasks
 import mill.api.DefaultTaskModule
-import mill.api.ExternalModule
 import mill.api.Result
-import mill.api.Task
+import mill.javalib.SonatypeCentralPublishModule.{
+  defaultAwaitTimeout,
+  defaultConnectTimeout,
+  defaultCredentials,
+  defaultReadTimeout,
+  getPublishingTypeFromReleaseFlag,
+  getSonatypeCredentials
+}
+import mill.javalib.publish.Artifact
+import mill.javalib.publish.SonatypeHelpers.{PASSWORD_ENV_VARIABLE_NAME, USERNAME_ENV_VARIABLE_NAME}
+import mill.api.BuildCtx
 import mill.api.daemon.Logger
 import mill.javalib.PublishModule.PublishData
-import mill.javalib.SonatypeCentralPublishModule.defaultAwaitTimeout
-import mill.javalib.SonatypeCentralPublishModule.defaultConnectTimeout
-import mill.javalib.SonatypeCentralPublishModule.defaultCredentials
-import mill.javalib.SonatypeCentralPublishModule.defaultReadTimeout
-import mill.javalib.SonatypeCentralPublishModule.getPublishingTypeFromReleaseFlag
 import mill.javalib.internal.PublishModule.GpgArgs
-import mill.javalib.publish.Artifact
-import mill.javalib.publish.SonatypeHelpers.CREDENTIALS_ENV_VARIABLE_PREFIX
-import mill.util.Tasks
 
-import javalib.*
-
-trait SonatypeCentralPublishModule extends PublishModule, MavenWorkerSupport,
-      PublishCredentialsModule {
+trait SonatypeCentralPublishModule extends PublishModule, MavenWorkerSupport {
 
   @deprecated("Use `sonatypeCentralGpgArgsForKey` instead.", "Mill 1.0.1")
   def sonatypeCentralGpgArgs: T[String] =
@@ -64,7 +63,7 @@ trait SonatypeCentralPublishModule extends PublishModule, MavenWorkerSupport,
       @unroll docs: Boolean = true
   ): Task.Command[Unit] = Task.Command {
     val artifact = artifactMetadata()
-    val credentials = getPublishCredentials(CREDENTIALS_ENV_VARIABLE_PREFIX, username, password)()
+    val credentials = getSonatypeCredentials(username, password)()
     val publishData = publishArtifactsPayload(sources = sources, docs = docs)()
     val publishingType = getPublishingTypeFromReleaseFlag(sonatypeCentralShouldRelease())
 
@@ -98,8 +97,8 @@ trait SonatypeCentralPublishModule extends PublishModule, MavenWorkerSupport,
 /**
  * External module to publish artifacts to `central.sonatype.org`
  */
-object SonatypeCentralPublishModule extends ExternalModule, DefaultTaskModule, MavenWorkerSupport,
-      PublishCredentialsModule, MavenPublish {
+object SonatypeCentralPublishModule extends ExternalModule with DefaultTaskModule
+    with MavenWorkerSupport {
   private final val sonatypeCentralGpgArgsSentinelValue = "<user did not override this method>"
 
   def self = this
@@ -128,7 +127,7 @@ object SonatypeCentralPublishModule extends ExternalModule, DefaultTaskModule, M
     val artifacts = Task.sequence(publishArtifacts.value)()
 
     val finalBundleName = if (bundleName.isEmpty) None else Some(bundleName)
-    val credentials = getPublishCredentials(CREDENTIALS_ENV_VARIABLE_PREFIX, username, password)()
+    val credentials = getSonatypeCredentials(username, password)()
     def makeGpgArgs() = internal.PublishModule.pgpImportSecretIfProvidedAndMakeGpgArgs(
       Task.env,
       GpgArgs.fromUserProvided(gpgArgs)
@@ -170,17 +169,37 @@ object SonatypeCentralPublishModule extends ExternalModule, DefaultTaskModule, M
     val dryRun = env.get("MILL_TESTS_PUBLISH_DRY_RUN").contains("1")
 
     def publishSnapshot(publishData: PublishData): Unit = {
-      mavenPublishData(
-        dryRun = dryRun,
-        publishData = publishData,
-        isSnapshot = true,
-        credentials = credentials,
-        releaseUri = sonatypeCentralSnapshotUri,
-        snapshotUri = sonatypeCentralSnapshotUri,
-        taskDest = taskDest,
-        log = log,
-        worker = worker
+      val uri = sonatypeCentralSnapshotUri
+      val artifacts = MavenWorkerSupport.RemoteM2Publisher.asM2ArtifactsFromPublishDatas(
+        publishData.meta,
+        publishData.payloadAsMap
       )
+
+      log.info(
+        s"Detected a 'SNAPSHOT' version for ${publishData.meta}, publishing to Sonatype Central Snapshots at '$uri'"
+      )
+
+      /** Maven uses this as a workspace for file manipulation. */
+      val mavenWorkspace = taskDest / "maven"
+
+      if (dryRun) {
+        val publishTo = taskDest / "repository"
+        val result = worker.publishToLocal(
+          publishTo = publishTo,
+          workspace = mavenWorkspace,
+          artifacts
+        )
+        log.info(s"Dry-run publishing to '$publishTo' finished with result: $result")
+      } else {
+        val result = worker.publishToRemote(
+          uri = uri,
+          workspace = mavenWorkspace,
+          username = credentials.username,
+          password = credentials.password,
+          artifacts
+        )
+        log.info(s"Publishing to '$uri' finished with result: $result")
+      }
     }
 
     def publishReleases(artifacts: Seq[PublishData], gpgArgs: GpgArgs): Unit = {
@@ -239,5 +258,36 @@ object SonatypeCentralPublishModule extends ExternalModule, DefaultTaskModule, M
     }
   }
 
+  private def getSonatypeCredential(
+      credentialParameterValue: String,
+      credentialName: String,
+      envVariableName: String
+  ): Task[String] = Task.Anon {
+    if (credentialParameterValue.nonEmpty) {
+      Result.Success(credentialParameterValue)
+    } else {
+      (for {
+        credential <- Task.env.get(envVariableName)
+      } yield {
+        Result.Success(credential)
+      }).getOrElse(
+        Result.Failure(
+          s"No $credentialName set. Consider using the $envVariableName environment variable or passing `$credentialName` argument"
+        )
+      )
+    }
+  }
+
+  private def getSonatypeCredentials(
+      usernameParameterValue: String,
+      passwordParameterValue: String
+  ): Task[SonatypeCredentials] = Task.Anon {
+    val username =
+      getSonatypeCredential(usernameParameterValue, "username", USERNAME_ENV_VARIABLE_NAME)()
+    val password =
+      getSonatypeCredential(passwordParameterValue, "password", PASSWORD_ENV_VARIABLE_NAME)()
+    Result.Success(SonatypeCredentials(username, password))
+  }
+
   lazy val millDiscover: mill.api.Discover = mill.api.Discover[this.type]
 }

libs/javalib/src/mill/javalib/MavenPublishModule.scala

@@ -8,9 +8,8 @@ import java.security.MessageDigest
 object SonatypeHelpers {
   // http://central.sonatype.org/pages/working-with-pgp-signatures.html#signing-a-file
 
-  val CREDENTIALS_ENV_VARIABLE_PREFIX = "MILL_SONATYPE"
-  val USERNAME_ENV_VARIABLE_NAME = s"${CREDENTIALS_ENV_VARIABLE_PREFIX}_USERNAME"
-  val PASSWORD_ENV_VARIABLE_NAME = s"${CREDENTIALS_ENV_VARIABLE_PREFIX}_PASSWORD"
+  val USERNAME_ENV_VARIABLE_NAME = "MILL_SONATYPE_USERNAME"
+  val PASSWORD_ENV_VARIABLE_NAME = "MILL_SONATYPE_PASSWORD"
 
   private[mill] def getArtifactMappings(
       isSigned: Boolean,

libs/javalib/src/mill/javalib/PublishCredentialsModule.scala

@@ -1,7 +1,5 @@
 package mill.scalalib
 
 object Dependency extends mill.api.ExternalModule.Alias(mill.javalib.Dependency)
-object MavenPublishModule
-    extends mill.api.ExternalModule.Alias(mill.javalib.MavenPublishModule)
 object SonatypeCentralPublishModule
     extends mill.api.ExternalModule.Alias(mill.javalib.SonatypeCentralPublishModule)