remove closeAndReleaseRepository task (#734)

vanniktech · Mar 10, 2024 · e80a256 · e80a256
1 parent 3d66614
commit e80a256
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,10 @@
 
 ## 0.28.0 **UNRELEASED**
 
-- Removed support for the deprecated Kotlin/JS plugin.
 - Updated minimum supported Gradle, Android Gradle Plugin and Kotlin versions.
+- Removed support for the deprecated Kotlin/JS plugin.
+- Removed the deprecated `closeAndReleaseRepository` task. Use `releaseRepository`, which
+  is functionally equivalent, instead.
 
 #### Minimum supported versions
 - JDK 11

diff --git a/plugin/src/main/kotlin/com/vanniktech/maven/publish/MavenPublishBaseExtension.kt b/plugin/src/main/kotlin/com/vanniktech/maven/publish/MavenPublishBaseExtension.kt
@@ -1,9 +1,8 @@
 package com.vanniktech.maven.publish
 
-import com.vanniktech.maven.publish.sonatype.CloseAndReleaseSonatypeRepositoryTask.Companion.registerCloseAndReleaseRepository
-import com.vanniktech.maven.publish.sonatype.CloseAndReleaseSonatypeRepositoryTask.Companion.registerReleaseRepository
 import com.vanniktech.maven.publish.sonatype.CreateSonatypeRepositoryTask.Companion.registerCreateRepository
 import com.vanniktech.maven.publish.sonatype.DropSonatypeRepositoryTask.Companion.registerDropRepository
+import com.vanniktech.maven.publish.sonatype.ReleaseSonatypeRepositoryTask.Companion.registerReleaseRepository
 import com.vanniktech.maven.publish.sonatype.SonatypeRepositoryBuildService.Companion.registerSonatypeRepositoryBuildService
 import com.vanniktech.maven.publish.tasks.WorkaroundSignatureType
 import org.gradle.api.Action
@@ -82,7 +81,6 @@ abstract class MavenPublishBaseExtension(
     }
 
     val releaseRepository = project.tasks.registerReleaseRepository(buildService, createRepository)
-    project.tasks.registerCloseAndReleaseRepository(buildService, createRepository)
     project.tasks.registerDropRepository(buildService, createRepository)
 
     project.tasks.register("publishToMavenCentral") {

diff --git a/.../CloseAndReleaseSonatypeRepositoryTask.kt → ...sonatype/ReleaseSonatypeRepositoryTask.kt b/.../CloseAndReleaseSonatypeRepositoryTask.kt → ...sonatype/ReleaseSonatypeRepositoryTask.kt
@@ -11,7 +11,7 @@ import org.gradle.api.tasks.TaskContainer
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.options.Option
 
-internal abstract class CloseAndReleaseSonatypeRepositoryTask : DefaultTask() {
+internal abstract class ReleaseSonatypeRepositoryTask : DefaultTask() {
   @get:Internal
   abstract val buildService: Property<SonatypeRepositoryBuildService>
 
@@ -28,35 +28,18 @@ internal abstract class CloseAndReleaseSonatypeRepositoryTask : DefaultTask() {
 
   companion object {
     private const val NAME = "releaseRepository"
-    private const val LEGACY_NAME = "closeAndReleaseRepository"
 
     fun TaskContainer.registerReleaseRepository(
       buildService: Provider<SonatypeRepositoryBuildService>,
       createRepository: TaskProvider<CreateSonatypeRepositoryTask>,
-    ): TaskProvider<CloseAndReleaseSonatypeRepositoryTask> {
-      return register(NAME, CloseAndReleaseSonatypeRepositoryTask::class.java) {
+    ): TaskProvider<ReleaseSonatypeRepositoryTask> {
+      return register(NAME, ReleaseSonatypeRepositoryTask::class.java) {
         it.description = "Releases a staging repository on Sonatype OSS"
         it.group = "release"
         it.buildService.set(buildService)
         it.usesService(buildService)
         it.mustRunAfter(createRepository)
       }
     }
-
-    fun TaskContainer.registerCloseAndReleaseRepository(
-      buildService: Provider<SonatypeRepositoryBuildService>,
-      createRepository: TaskProvider<CreateSonatypeRepositoryTask>,
-    ): TaskProvider<CloseAndReleaseSonatypeRepositoryTask> {
-      return register(LEGACY_NAME, CloseAndReleaseSonatypeRepositoryTask::class.java) {
-        it.description = "Closes and releases a staging repository on Sonatype OSS"
-        it.group = "release"
-        it.buildService.set(buildService)
-        it.usesService(buildService)
-        it.mustRunAfter(createRepository)
-        it.doLast { task ->
-          task.logger.warn("$LEGACY_NAME is deprecated and will be removed in a future release, use $NAME instead.")
-        }
-      }
-    }
   }
 }