Remove tombstones (#6222)

apollographql · Oct 28, 2024 · 2b5d778 · 2b5d778
1 parent 174cb22
commit 2b5d778
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 71 deletions.
diff --git a/build-logic/src/main/kotlin/Publishing.kt b/build-logic/src/main/kotlin/Publishing.kt
@@ -21,12 +21,7 @@ import org.jetbrains.dokka.gradle.engine.plugins.DokkaVersioningPluginParameters
 import org.jetbrains.dokka.gradle.tasks.DokkaGenerateTask
 import javax.inject.Inject
 
-class Tombstone(
-    val group: String,
-    val artifact: String,
-    val version: String,
-    )
-fun Project.configurePublishing(isAggregateKdoc: Boolean = false, tombstone: Tombstone? = null) {
+fun Project.configurePublishing(isAggregateKdoc: Boolean = false) {
   apply {
     plugin("signing")
   }
@@ -49,7 +44,7 @@ fun Project.configurePublishing(isAggregateKdoc: Boolean = false, tombstone: Tom
   if (isAggregateKdoc) {
     configureDokkaAggregate()
   }
-  configurePublishingInternal(tombstone)
+  configurePublishingInternal()
 }
 
 fun Project.configureDokkaCommon(): DokkaExtension {
@@ -199,7 +194,7 @@ private fun Project.getOssStagingUrl(): String {
   }
 }
 
-private fun Project.configurePublishingInternal(tombstone: Tombstone?) {
+private fun Project.configurePublishingInternal() {
   val emptyJavadocJar = tasks.register("emptyJavadocJar", org.gradle.jvm.tasks.Jar::class.java) {
     archiveClassifier.set("javadoc")
 
@@ -289,20 +284,6 @@ private fun Project.configurePublishingInternal(tombstone: Tombstone?) {
             artifactId = project.name
           }
         }
-        tombstone != null ->{
-          withType(MavenPublication::class.java).configureEach {
-            pom {
-              distributionManagement {
-                relocation {
-                  groupId.set(tombstone.group)
-                  artifactId.set(tombstone.artifact)
-                  version.set(tombstone.version)
-                  message.set("This artifact is has moved. See https://go.apollo.dev/ak-moved-artifacts")
-                }
-              }
-            }
-          }
-        }
 
         else -> {
           /**

diff --git a/build-logic/src/main/kotlin/api.kt b/build-logic/src/main/kotlin/api.kt
@@ -16,14 +16,6 @@ class KotlinCompilerOptions(
     val version: KotlinVersion = KotlinVersion.KOTLIN_2_0,
 )
 
-fun Project.apolloTombstone(
-    group: String,
-    artifact: String,
-    version: String,
-) {
-  configurePublishing(tombstone = Tombstone(group, artifact, version))
-}
-
 fun Project.apolloLibrary(
     namespace: String,
     jvmTarget: Int? = null,

diff --git a/libraries/apollo-engine-ktor/README.md b/libraries/apollo-engine-ktor/README.md
diff --git a/libraries/apollo-engine-ktor/api/apollo-engine-ktor.api b/libraries/apollo-engine-ktor/api/apollo-engine-ktor.api
diff --git a/libraries/apollo-engine-ktor/api/apollo-engine-ktor.klib.api b/libraries/apollo-engine-ktor/api/apollo-engine-ktor.klib.api
diff --git a/libraries/apollo-engine-ktor/build.gradle.kts b/libraries/apollo-engine-ktor/build.gradle.kts
diff --git a/libraries/apollo-engine-ktor/gradle.properties b/libraries/apollo-engine-ktor/gradle.properties
diff --git a/libraries/apollo-mockserver/build.gradle.kts b/libraries/apollo-mockserver/build.gradle.kts
diff --git a/libraries/apollo-mockserver/gradle.properties b/libraries/apollo-mockserver/gradle.properties