KT-50059 Stop publishing artifacts with 'modular' classifier

buildSrc/src/main/kotlin/artifacts.kt

@@ -168,33 +168,6 @@ fun Project.javadocJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> {
     return javadocTask
 }
 
-fun Project.modularJar(body: Jar.() -> Unit): TaskProvider<Jar> {
-    val modularJar = configurations.maybeCreate("modularJar").apply {
-        isCanBeConsumed = true
-        isCanBeResolved = false
-        attributes {
-            attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
-            attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named("modular-jar"))
-        }
-    }
-
-    val modularJarTask = getOrCreateTask<Jar>("modularJar") {
-        archiveClassifier.set("modular")
-
-        body()
-    }
-
-    addArtifact("modularJar", modularJarTask)
-    addArtifact("archives", modularJarTask)
-
-    configurePublishedComponent {
-        addVariantsFromConfiguration(modularJar) { mapToMavenScope("runtime") }
-    }
-
-    return modularJarTask
-}
-
-
 fun Project.standardPublicJars() {
     runtimeJar()
     sourcesJar()

libraries/commonConfiguration.gradle

@@ -89,13 +89,6 @@ allprojects { project ->
         }
     }
 
-    project.ext.configureModularJar = { lambda = {} ->
-        ArtifactsKt.modularJar(project) { task ->
-            lambda.delegate = task
-            lambda()
-        }
-    }
-
     dependencies.ext.kotlinStdlib = { suffix ->
         DependenciesKt.kotlinStdlib(project, suffix, null)
     }

libraries/kotlin.test/jvm/build.gradle

@@ -28,13 +28,6 @@ jar {
     }
 }
 
-configureModularJar {
-    dependsOn(jar)
-    manifestAttributes(manifest, project, 'Test', true)
-
-    from zipTree(jar.outputs.files.singleFile)
-}
-
 configureSourcesJar()
 
 configureJavadocJar()

libraries/reflect/build.gradle.kts

@@ -236,18 +236,6 @@ val result by task<Jar> {
 
 javadocJar()
 
-modularJar {
-    dependsOn(intermediate)
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    from {
-        zipTree(intermediate.get().singleOutputFile())
-    }
-    from(zipTree(provider { reflectShadowJar.get().archiveFile.get().asFile })) {
-        include("META-INF/versions/**")
-    }
-    callGroovy("manifestAttributes", manifest, project, "Main", true)
-}
-
 dexMethodCount {
     dependsOn(result)
     jarFile = result.get().outputs.files.single()

libraries/stdlib/jdk7/build.gradle

@@ -51,19 +51,10 @@ jar {
     from sourceSets.java9.output
 }
 
-configureModularJar {
-    dependsOn(jar)
-    manifestAttributes(manifest, project, 'Main', true)
-
-    from zipTree(jar.outputs.files.singleFile)
-}
-
 
 artifacts {
     archives sourcesJar
     sources sourcesJar
-
-    archives modularJar
 }
 
 compileKotlin {

libraries/stdlib/jdk8/build.gradle

@@ -54,18 +54,10 @@ jar {
     from sourceSets.java9.output
 }
 
-configureModularJar {
-    dependsOn(jar)
-    manifestAttributes(manifest, project, 'Main', true)
-
-    from zipTree(jar.outputs.files.singleFile)
-}
 
 artifacts {
     archives sourcesJar
     sources sourcesJar
-
-    archives modularJar
 }
 
 compileKotlin {

libraries/stdlib/jvm/build.gradle

@@ -93,18 +93,10 @@ task distSourcesJar(type: Jar) {
     }
 }
 
-configureModularJar {
-    dependsOn(jar)
-    manifestAttributes(manifest, project, 'Main', true)
-
-    from zipTree(jar.outputs.files.singleFile)
-}
-
 artifacts {
     archives sourcesJar
     sources sourcesJar
     distSources distSourcesJar
-    archives modularJar
 }
 
 DexMethodCountKt.dexMethodCount(project) { task ->

libraries/tools/kotlin-maven-plugin-test/pom.xml

@@ -130,10 +130,6 @@
                                 <artifact>org.jetbrains.kotlin:kotlin-stdlib-jdk7:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-stdlib-jdk8:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-reflect:${project.version}</artifact>
-                                <artifact>org.jetbrains.kotlin:kotlin-stdlib:${project.version}:jar:modular</artifact>
-                                <artifact>org.jetbrains.kotlin:kotlin-stdlib-jdk7:${project.version}:jar:modular</artifact>
-                                <artifact>org.jetbrains.kotlin:kotlin-stdlib-jdk8:${project.version}:jar:modular</artifact>
-                                <artifact>org.jetbrains.kotlin:kotlin-reflect:${project.version}:jar:modular</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-test-common:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-test-annotations-common:${project.version}</artifact>
                                 <artifact>org.jetbrains.kotlin:kotlin-test:${project.version}</artifact>

libraries/tools/kotlin-maven-plugin-test/src/it/java9/test-jlink-modular-artifacts/jlinked/pom.xml

@@ -21,7 +21,6 @@
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
-            <classifier>modular</classifier>
             <exclusions>
                 <exclusion>
                     <groupId>org.jetbrains.kotlin</groupId>
@@ -33,45 +32,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk7</artifactId>
-            <version>${kotlin.version}</version>
-            <classifier>modular</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>${kotlin.version}</version>
-            <classifier>modular</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib-jdk7</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <dependency>
             <groupId>org.test</groupId>
             <artifactId>test-mavenModularApp</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-stdlib-jdk8</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>