diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index 1131bda97c8..0ef210a968a 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -168,33 +168,6 @@ fun Project.javadocJar(body: Jar.() -> Unit = {}): TaskProvider { return javadocTask } -fun Project.modularJar(body: Jar.() -> Unit): TaskProvider { - 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("modularJar") { - archiveClassifier.set("modular") - - body() - } - - addArtifact("modularJar", modularJarTask) - addArtifact("archives", modularJarTask) - - configurePublishedComponent { - addVariantsFromConfiguration(modularJar) { mapToMavenScope("runtime") } - } - - return modularJarTask -} - - fun Project.standardPublicJars() { runtimeJar() sourcesJar() diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle index f1b7f51e39b..536ded6caf7 100644 --- a/libraries/commonConfiguration.gradle +++ b/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) } diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle index 8e6078f2684..c5cd642a77a 100644 --- a/libraries/kotlin.test/jvm/build.gradle +++ b/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() diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index d80284c25d4..a7b83ba02e8 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -236,18 +236,6 @@ val result by task { 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() diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 6087bf951f5..00693394371 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/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 { diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 5ee8642ef4f..4f251e61bf4 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/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 { diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index 7d9129869a5..a32549815fb 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/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 -> diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index db2be72841a..50ccd2a5ad3 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -130,10 +130,6 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:${project.version} org.jetbrains.kotlin:kotlin-stdlib-jdk8:${project.version} org.jetbrains.kotlin:kotlin-reflect:${project.version} - org.jetbrains.kotlin:kotlin-stdlib:${project.version}:jar:modular - org.jetbrains.kotlin:kotlin-stdlib-jdk7:${project.version}:jar:modular - org.jetbrains.kotlin:kotlin-stdlib-jdk8:${project.version}:jar:modular - org.jetbrains.kotlin:kotlin-reflect:${project.version}:jar:modular org.jetbrains.kotlin:kotlin-test-common:${project.version} org.jetbrains.kotlin:kotlin-test-annotations-common:${project.version} org.jetbrains.kotlin:kotlin-test:${project.version} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/java9/test-jlink-modular-artifacts/jlinked/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/java9/test-jlink-modular-artifacts/jlinked/pom.xml index 6567fbbad7d..c0a552db38e 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/java9/test-jlink-modular-artifacts/jlinked/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/java9/test-jlink-modular-artifacts/jlinked/pom.xml @@ -21,7 +21,6 @@ org.jetbrains.kotlin kotlin-stdlib ${kotlin.version} - modular org.jetbrains.kotlin @@ -33,45 +32,11 @@ - - org.jetbrains.kotlin - kotlin-stdlib-jdk7 - ${kotlin.version} - modular - - - org.jetbrains.kotlin - kotlin-stdlib - - - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - modular - - - org.jetbrains.kotlin - kotlin-stdlib-jdk7 - - - org.jetbrains.kotlin - kotlin-stdlib - - - org.test test-mavenModularApp 1.0-SNAPSHOT - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - -