Skip to content

Commit ae65b63

Browse files
CristianGMSpace Team
authored and
Space Team
committed
Revert "[JPS] Replace the Maven serialization plugin with the regular compiler plugin"
This reverts commit 8551ba0.
1 parent fd51b6e commit ae65b63

File tree

4 files changed

+2
-54
lines changed

4 files changed

+2
-54
lines changed

libraries/tools/kotlin-dist-for-jps-meta/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
</dependency>
131131
<dependency>
132132
<groupId>${project.groupId}</groupId>
133-
<artifactId>kotlin-maven-serialization-for-jps-avoid-using-this</artifactId>
133+
<artifactId>kotlin-maven-serialization</artifactId>
134134
<version>${project.version}</version>
135135
</dependency>
136136
<dependency>

plugins/kotlinx-serialization/build.gradle.kts

-24
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import org.gradle.api.publish.internal.PublicationInternal
21
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
32
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
4-
import plugins.KotlinBuildPublishingPlugin.Companion.ADHOC_COMPONENT_NAME
5-
import plugins.configureKotlinPomAttributes
63

74
description = "Kotlin Serialization Compiler Plugin"
85

@@ -136,24 +133,3 @@ fun Test.setUpJsIrBoxTests() {
136133
systemProperty("serialization.json.path", localJsJsonRuntimeForTests.asPath)
137134
}
138135
}
139-
140-
//region Workaround for KT-76495 and KTIJ-33877
141-
val publications: PublicationContainer = extensions.getByType<PublishingExtension>().publications
142-
val jpsCompatArtifactId = "kotlin-maven-serialization-for-jps-avoid-using-this"
143-
val jpsCompatPublication = publications.register<MavenPublication>("jpsCompat") {
144-
artifactId = jpsCompatArtifactId
145-
from(components[ADHOC_COMPONENT_NAME])
146-
147-
// Workaround for https://github.com/gradle/gradle/issues/12324
148-
(this as PublicationInternal<*>).isAlias = true
149-
configureKotlinPomAttributes(
150-
project,
151-
explicitDescription = "A workaround for KT-76495 and KTIJ-33877. Avoid depending on this artifact as it can be removed without prior notice."
152-
)
153-
}
154-
configureSbom(
155-
target = "${jpsCompatPublication.name.capitalize()}Publication",
156-
documentName = jpsCompatArtifactId,
157-
publication = jpsCompatPublication
158-
)
159-
//endregion

repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-dist-for-jps-meta/kotlin-dist-for-jps-meta.pom

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
</dependency>
131131
<dependency>
132132
<groupId>${project.groupId}</groupId>
133-
<artifactId>kotlin-maven-serialization-for-jps-avoid-using-this</artifactId>
133+
<artifactId>kotlin-maven-serialization</artifactId>
134134
<version>${project.version}</version>
135135
</dependency>
136136
<dependency>

repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-maven-serialization-for-jps-avoid-using-this/kotlin-maven-serialization-for-jps-avoid-using-this.pom

-28
This file was deleted.

0 commit comments

Comments
 (0)