From 48a4d7d4186d0642d8e69bb274e18268af69fcd6 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 26 Apr 2021 15:41:04 +0300 Subject: [PATCH] Build: drop maven publication for Kotlin plugin artifacts --- gradle/kotlinPluginPublication.gradle.kts | 63 ------------------- idea/ide-common/build.gradle.kts | 2 - idea/kotlin-gradle-tooling/build.gradle.kts | 2 - idea/performanceTests/build.gradle.kts | 2 - plugins/allopen/allopen-cli/build.gradle.kts | 2 - plugins/allopen/allopen-ide/build.gradle.kts | 2 - .../build.gradle.kts | 2 - .../android-extensions-idea/build.gradle.kts | 2 - plugins/kapt3/kapt3-idea/build.gradle.kts | 2 - .../build.gradle.kts | 2 - .../lombok-compiler-plugin/build.gradle.kts | 2 - .../lombok/lombok-ide-plugin/build.gradle.kts | 2 - plugins/noarg/noarg-cli/build.gradle.kts | 2 - plugins/noarg/noarg-ide/build.gradle.kts | 2 - .../parcelize-compiler/build.gradle.kts | 2 - .../parcelize/parcelize-ide/build.gradle.kts | 2 - .../sam-with-receiver-ide/build.gradle.kts | 2 - prepare/idea-plugin/build.gradle.kts | 2 - 18 files changed, 97 deletions(-) delete mode 100644 gradle/kotlinPluginPublication.gradle.kts diff --git a/gradle/kotlinPluginPublication.gradle.kts b/gradle/kotlinPluginPublication.gradle.kts deleted file mode 100644 index 2ee60686610..00000000000 --- a/gradle/kotlinPluginPublication.gradle.kts +++ /dev/null @@ -1,63 +0,0 @@ -apply(plugin = "maven-publish") - -configure { - publications { - create("KotlinPlugin") { - val artifactName = if (project.name == "idea-plugin") "kotlin-plugin" else project.name - artifactId = "$artifactName-${IdeVersionConfigurator.currentIde.name.toLowerCase()}" - from(components["java"]) - - pom { - name.set("${project.group}:$artifactId") - packaging = "jar" - description.set(project.description) - url.set("https://kotlinlang.org/") - licenses { - license { - name.set("The Apache License, Version 2.0") - url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") - } - } - scm { - url.set("https://github.com/JetBrains/kotlin") - connection.set("scm:git:https://github.com/JetBrains/kotlin.git") - developerConnection.set("scm:git:https://github.com/JetBrains/kotlin.git") - } - developers { - developer { - name.set("Kotlin Team") - organization.set("JetBrains") - organizationUrl.set("https://www.jetbrains.com") - } - } - } - } - } - - repositories { - maven { - url = uri(findProperty("deployRepoUrl") ?: findProperty("deploy-url") ?: "${rootProject.buildDir}/repo") - authentication { - val mavenUser = findProperty("kotlin.bintray.user") as String? - val mavenPass = findProperty("kotlin.bintray.password") as String? - if (url.scheme != "file" && mavenUser != null && mavenPass != null) { - credentials { - username = mavenUser - password = mavenPass - } - } - } - } - } -} - -tasks.withType { - enabled = false -} - -// Disable default `publish` task so publishing will not be done during maven artifact publish -// We should use specialized tasks since we have multiple publications in project -tasks.named("publish") { - enabled = false - dependsOn.clear() -} \ No newline at end of file diff --git a/idea/ide-common/build.gradle.kts b/idea/ide-common/build.gradle.kts index f0b837cdb78..bca997c09fe 100644 --- a/idea/ide-common/build.gradle.kts +++ b/idea/ide-common/build.gradle.kts @@ -22,5 +22,3 @@ sourceSets { sourcesJar() javadocJar() - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts index 1e96bc73c5b..84d1d3e7bf3 100644 --- a/idea/kotlin-gradle-tooling/build.gradle.kts +++ b/idea/kotlin-gradle-tooling/build.gradle.kts @@ -36,5 +36,3 @@ runtimeJar() sourcesJar() javadocJar() - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/idea/performanceTests/build.gradle.kts b/idea/performanceTests/build.gradle.kts index d504c294b61..a2d99cfba8d 100644 --- a/idea/performanceTests/build.gradle.kts +++ b/idea/performanceTests/build.gradle.kts @@ -59,8 +59,6 @@ sourcesJar() javadocJar() -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") - projectTest(taskName = "performanceTest") { exclude("**/*WholeProjectPerformanceTest*") diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts index 7045eca1ac3..aae3021210d 100644 --- a/plugins/allopen/allopen-cli/build.gradle.kts +++ b/plugins/allopen/allopen-cli/build.gradle.kts @@ -37,5 +37,3 @@ testsJar() projectTest(parallel = true) { workingDir = rootDir } - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/allopen/allopen-ide/build.gradle.kts b/plugins/allopen/allopen-ide/build.gradle.kts index 70c5ecde2ff..11d4df45825 100644 --- a/plugins/allopen/allopen-ide/build.gradle.kts +++ b/plugins/allopen/allopen-ide/build.gradle.kts @@ -62,5 +62,3 @@ sourcesJar() javadocJar() projectTest(parallel = true) - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index be3ea83bfb1..add198b9a24 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -79,5 +79,3 @@ projectTest { systemProperty("robolectric.classpath", robolectricClasspathProvider.get()) } } - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index ff7966b3995..ee4f014e4b7 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -88,5 +88,3 @@ runtimeJar() sourcesJar() javadocJar() - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index 3a299066a7e..efc084cf021 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -28,5 +28,3 @@ runtimeJar() sourcesJar() javadocJar() - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index a6d69bef9d0..fc7f496f9a6 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -46,5 +46,3 @@ testsJar() projectTest(parallel = true) { workingDir = rootDir } - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/lombok/lombok-compiler-plugin/build.gradle.kts b/plugins/lombok/lombok-compiler-plugin/build.gradle.kts index b2625dd2420..50ceac92a6b 100644 --- a/plugins/lombok/lombok-compiler-plugin/build.gradle.kts +++ b/plugins/lombok/lombok-compiler-plugin/build.gradle.kts @@ -39,5 +39,3 @@ testsJar() sourcesJar() javadocJar() - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/lombok/lombok-ide-plugin/build.gradle.kts b/plugins/lombok/lombok-ide-plugin/build.gradle.kts index c6bf270ee71..8624fb43ca2 100644 --- a/plugins/lombok/lombok-ide-plugin/build.gradle.kts +++ b/plugins/lombok/lombok-ide-plugin/build.gradle.kts @@ -32,5 +32,3 @@ sourcesJar() javadocJar() projectTest(parallel = true) - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts index fdbbc6c6148..f2f41cf9300 100644 --- a/plugins/noarg/noarg-cli/build.gradle.kts +++ b/plugins/noarg/noarg-cli/build.gradle.kts @@ -41,5 +41,3 @@ testsJar() projectTest(parallel = true) { workingDir = rootDir } - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/noarg/noarg-ide/build.gradle.kts b/plugins/noarg/noarg-ide/build.gradle.kts index 069251a7016..b6d1ae215c1 100644 --- a/plugins/noarg/noarg-ide/build.gradle.kts +++ b/plugins/noarg/noarg-ide/build.gradle.kts @@ -62,5 +62,3 @@ sourcesJar() javadocJar() projectTest(parallel = true) - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts index 0fd2da725e0..c0d65fc353c 100644 --- a/plugins/parcelize/parcelize-compiler/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts @@ -71,5 +71,3 @@ projectTest { systemProperty("robolectric.classpath", robolectricClasspathProvider.get()) } } - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/parcelize/parcelize-ide/build.gradle.kts b/plugins/parcelize/parcelize-ide/build.gradle.kts index c3fdf8d80c2..ba7ee0debd1 100644 --- a/plugins/parcelize/parcelize-ide/build.gradle.kts +++ b/plugins/parcelize/parcelize-ide/build.gradle.kts @@ -51,5 +51,3 @@ projectTest(parallel = true) { workingDir = rootDir useAndroidJar() } - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts index 6cd082b1d2a..6af0bd61596 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts @@ -33,5 +33,3 @@ runtimeJar() sourcesJar() javadocJar() - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index eb0bafb1523..79dd2042db3 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -233,5 +233,3 @@ tasks.register("ideaPlugin") { rename(quote("-$version"), "") rename(quote("-$bootstrapKotlinVersion"), "") } - -apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts")