diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle deleted file mode 100644 index 7ed4cfdd9da..00000000000 --- a/libraries/tools/kotlin-allopen/build.gradle +++ /dev/null @@ -1,37 +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(':kotlin-compiler-embeddable') - compileOnly project(':kotlin-allopen-compiler-plugin') - - embedded(project(":kotlin-allopen-compiler-plugin")) { transitive = false } -} - -ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) -configureSourcesJar() -configureJavadocJar() - -pluginBundle { - plugins { - kotlinAllopenPlugin { - id = 'org.jetbrains.kotlin.plugin.allopen' - description = displayName = 'Kotlin All Open compiler plugin' - } - kotlinSpringPlugin { - id = 'org.jetbrains.kotlin.plugin.spring' - description = displayName = 'Kotlin Spring compiler plugin' - } - } -} - -configurePluginMarkers(project) diff --git a/libraries/tools/kotlin-allopen/build.gradle.kts b/libraries/tools/kotlin-allopen/build.gradle.kts new file mode 100644 index 00000000000..05e9d14d6e4 --- /dev/null +++ b/libraries/tools/kotlin-allopen/build.gradle.kts @@ -0,0 +1,36 @@ +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(":kotlin-compiler-embeddable")) + compileOnly(project(":kotlin-allopen-compiler-plugin")) + + embedded(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } +} + +gradlePlugin { + plugins { + create("kotlinAllopenPlugin") { + id = "org.jetbrains.kotlin.plugin.allopen" + displayName = "Kotlin All Open compiler plugin" + description = displayName + implementationClass = "org.jetbrains.kotlin.allopen.gradle.AllOpenGradleSubplugin" + } + create("kotlinSpringPlugin") { + id = "org.jetbrains.kotlin.plugin.spring" + displayName = "Kotlin Spring compiler plugin" + description = displayName + implementationClass = "org.jetbrains.kotlin.allopen.gradle.SpringGradleSubplugin" + } + } +} diff --git a/libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.allopen.properties b/libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.allopen.properties deleted file mode 100644 index a454f56564c..00000000000 --- a/libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.allopen.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.allopen.gradle.AllOpenGradleSubplugin \ No newline at end of file diff --git a/libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.spring.properties b/libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.spring.properties deleted file mode 100644 index 32ce0b3cf8a..00000000000 --- a/libraries/tools/kotlin-allopen/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.spring.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.allopen.gradle.SpringGradleSubplugin \ No newline at end of file