From 9f0df8f6b57473e780a857c0b71e10a258b2904a Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 10 Feb 2022 12:23:51 +0100 Subject: [PATCH] Migrate sam-with-receiver plugin configuration This change should also trigger proper publishing of this plugin to Gradle plugin portal. ^KT-49227 In Progress --- .../gradle/testbase/projectSetupDefaults.kt | 7 ++-- .../kotlin-sam-with-receiver/build.gradle | 23 ------------- .../kotlin-sam-with-receiver/build.gradle.kts | 32 +++++++++++++++++++ ...kotlin.plugin.sam.with.receiver.properties | 1 - 4 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 libraries/tools/kotlin-sam-with-receiver/build.gradle create mode 100644 libraries/tools/kotlin-sam-with-receiver/build.gradle.kts delete mode 100644 libraries/tools/kotlin-sam-with-receiver/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.sam.with.receiver.properties diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt index 314bf79ee98..4518878a16c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt @@ -30,6 +30,7 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE = id "org.jetbrains.kotlin.plugin.jpa" version "${'$'}kotlin_version" id "org.jetbrains.kotlin.plugin.noarg" version "${'$'}kotlin_version" id "org.jetbrains.kotlin.plugin.lombok" version "${'$'}kotlin_version" + id "org.jetbrains.kotlin.plugin.sam.with.receiver" version "${'$'}kotlin_version" id "org.jetbrains.kotlin.plugin.serialization" version "${'$'}kotlin_version" id "org.jetbrains.kotlin.test.fixes.android" version "${'$'}test_fixes_version" id "org.jetbrains.kotlin.gradle-subplugin-example" version "${'$'}kotlin_version" @@ -55,9 +56,6 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE = case "kotlin2js": useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version") break - case "org.jetbrains.kotlin.plugin.sam.with.receiver": - useModule("org.jetbrains.kotlin:kotlin-sam-with-receiver:${'$'}kotlin_version") - break } } } @@ -90,6 +88,7 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE = id("org.jetbrains.kotlin.plugin.jpa") version kotlin_version id("org.jetbrains.kotlin.plugin.noarg") version kotlin_version id("org.jetbrains.kotlin.plugin.lombok") version kotlin_version + id("org.jetbrains.kotlin.plugin.sam.with.receiver") version kotlin_version id("org.jetbrains.kotlin.plugin.serialization") version kotlin_version id("org.jetbrains.kotlin.test.fixes.android") version test_fixes_version id("org.jetbrains.kotlin.gradle-subplugin-example") version kotlin_version @@ -109,8 +108,6 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE = "com.android.feature" -> useModule("com.android.tools.build:gradle:${'$'}android_tools_version") "kotlin-dce-js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version") "kotlin2js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version") - "org.jetbrains.kotlin.plugin.sam.with.receiver" -> - useModule("org.jetbrains.kotlin:kotlin-sam-with-receiver:${'$'}kotlin_version") } } } diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle deleted file mode 100644 index 2995583f1f5..00000000000 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - id "gradle-plugin-common-configuration" - id "jps-compatible" -} - -pill { - variant = 'FULL' -} - -dependencies { - api project(':kotlin-gradle-plugin-api') - api project(':kotlin-gradle-plugin-model') - - compileOnly project(':compiler') - compileOnly project(':kotlin-sam-with-receiver-compiler-plugin') - - testApi gradleApi() - testApi DependenciesKt.commonDependency(project, "junit") - - embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false } -} - -ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts new file mode 100644 index 00000000000..dbb1ca00dbd --- /dev/null +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts @@ -0,0 +1,32 @@ +import org.jetbrains.kotlin.pill.PillExtension + +plugins { + id("gradle-plugin-common-configuration") + id("jps-compatible") +} + +pill { + variant = PillExtension.Variant.FULL +} + +dependencies { + api(project(":kotlin-gradle-plugin-model")) + + compileOnly(project(":compiler")) + compileOnly(project(":kotlin-sam-with-receiver-compiler-plugin")) + + testApi(commonDependency("junit")) + + embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } +} + +gradlePlugin { + plugins { + create("samWithReceiver") { + id = "org.jetbrains.kotlin.plugin.sam.with.receiver" + displayName = "" + description = displayName + implementationClass = "org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin" + } + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.sam.with.receiver.properties b/libraries/tools/kotlin-sam-with-receiver/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.sam.with.receiver.properties deleted file mode 100644 index 0f416ab25a0..00000000000 --- a/libraries/tools/kotlin-sam-with-receiver/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.sam.with.receiver.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin \ No newline at end of file