diff --git a/build-logic/src/main/kotlin/Publishing.kt b/build-logic/src/main/kotlin/Publishing.kt index a4527229ccf..ba555ffff00 100644 --- 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 index 49f2cd2374f..5e4f6d071a1 100644 --- 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 deleted file mode 100644 index b3e3018d32c..00000000000 --- a/libraries/apollo-engine-ktor/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Module apollo-engine-ktor - -`apollo-engine-ktor` is an implementation of `HttpEngine` and `WebSocketEngine` that uses Ktor. - -This module is deprecated and moved to the Apollo Galaxy. See the [Apollo Galaxy page](https://www.apollographql.com/docs/kotlin/advanced/galaxy) for more details. diff --git a/libraries/apollo-engine-ktor/api/apollo-engine-ktor.api b/libraries/apollo-engine-ktor/api/apollo-engine-ktor.api deleted file mode 100644 index 33ab5eb1f1a..00000000000 --- a/libraries/apollo-engine-ktor/api/apollo-engine-ktor.api +++ /dev/null @@ -1,8 +0,0 @@ -public final class com/apollographql/apollo/network/adapter/KtorHttpUrlAdapter : com/apollographql/apollo/api/Adapter { - public static final field INSTANCE Lcom/apollographql/apollo/network/adapter/KtorHttpUrlAdapter; - public fun fromJson (Lcom/apollographql/apollo/api/json/JsonReader;Lcom/apollographql/apollo/api/CustomScalarAdapters;)Lio/ktor/http/Url; - public synthetic fun fromJson (Lcom/apollographql/apollo/api/json/JsonReader;Lcom/apollographql/apollo/api/CustomScalarAdapters;)Ljava/lang/Object; - public fun toJson (Lcom/apollographql/apollo/api/json/JsonWriter;Lcom/apollographql/apollo/api/CustomScalarAdapters;Lio/ktor/http/Url;)V - public synthetic fun toJson (Lcom/apollographql/apollo/api/json/JsonWriter;Lcom/apollographql/apollo/api/CustomScalarAdapters;Ljava/lang/Object;)V -} - diff --git a/libraries/apollo-engine-ktor/api/apollo-engine-ktor.klib.api b/libraries/apollo-engine-ktor/api/apollo-engine-ktor.klib.api deleted file mode 100644 index 990969d33fb..00000000000 --- a/libraries/apollo-engine-ktor/api/apollo-engine-ktor.klib.api +++ /dev/null @@ -1,12 +0,0 @@ -// Klib ABI Dump -// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm32, watchosArm64, watchosSimulatorArm64] -// Rendering settings: -// - Signature version: 2 -// - Show manifest properties: true -// - Show declarations: true - -// Library unique name: -final object com.apollographql.apollo.network.adapter/KtorHttpUrlAdapter : com.apollographql.apollo.api/Adapter { // com.apollographql.apollo.network.adapter/KtorHttpUrlAdapter|null[0] - final fun fromJson(com.apollographql.apollo.api.json/JsonReader, com.apollographql.apollo.api/CustomScalarAdapters): io.ktor.http/Url // com.apollographql.apollo.network.adapter/KtorHttpUrlAdapter.fromJson|fromJson(com.apollographql.apollo.api.json.JsonReader;com.apollographql.apollo.api.CustomScalarAdapters){}[0] - final fun toJson(com.apollographql.apollo.api.json/JsonWriter, com.apollographql.apollo.api/CustomScalarAdapters, io.ktor.http/Url) // com.apollographql.apollo.network.adapter/KtorHttpUrlAdapter.toJson|toJson(com.apollographql.apollo.api.json.JsonWriter;com.apollographql.apollo.api.CustomScalarAdapters;io.ktor.http.Url){}[0] -} diff --git a/libraries/apollo-engine-ktor/build.gradle.kts b/libraries/apollo-engine-ktor/build.gradle.kts deleted file mode 100644 index 76adbf6d217..00000000000 --- a/libraries/apollo-engine-ktor/build.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -apolloTombstone( - group = "com.apollographql.ktor", - artifact = "apollo-engine-ktor", - version = "0.0.2" -) - diff --git a/libraries/apollo-engine-ktor/gradle.properties b/libraries/apollo-engine-ktor/gradle.properties deleted file mode 100644 index 1a6711b9994..00000000000 --- a/libraries/apollo-engine-ktor/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -POM_NAME=Apollo Engine Ktor -POM_DESCRIPTION=Http and WebSocket engines for Apollo Kotlin based on Ktor - diff --git a/libraries/apollo-mockserver/build.gradle.kts b/libraries/apollo-mockserver/build.gradle.kts deleted file mode 100644 index a3667db1a40..00000000000 --- a/libraries/apollo-mockserver/build.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -apolloTombstone( - group = "com.apollographql.mockserver", - artifact = "apollo-mockserver", - version = "0.0.3", -) diff --git a/libraries/apollo-mockserver/gradle.properties b/libraries/apollo-mockserver/gradle.properties deleted file mode 100644 index 8dace404304..00000000000 --- a/libraries/apollo-mockserver/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -POM_NAME=Apollo Mockserver -POM_DESCRIPTION=Apollo Mockserver