diff --git a/libraries/tools/kotlin-allopen/build.gradle.kts b/libraries/tools/kotlin-allopen/build.gradle.kts index cec452a9e7e..197df6c8256 100644 --- a/libraries/tools/kotlin-allopen/build.gradle.kts +++ b/libraries/tools/kotlin-allopen/build.gradle.kts @@ -15,8 +15,6 @@ dependencies { commonCompileOnly(project(":kotlin-compiler-embeddable")) commonCompileOnly(project(":kotlin-allopen-compiler-plugin")) - - embedded(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } } gradlePlugin { diff --git a/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt b/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt index 4df03ecd8dd..1d577ec9e1b 100644 --- a/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt +++ b/libraries/tools/kotlin-allopen/src/common/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt @@ -33,7 +33,7 @@ class AllOpenGradleSubplugin return project.extensions.getByType(AllOpenExtension::class.java) } - private const val ALLOPEN_ARTIFACT_NAME = "kotlin-allopen" + private const val ALLOPEN_ARTIFACT_NAME = "kotlin-allopen-compiler-plugin-embeddable" private const val ANNOTATION_ARG_NAME = "annotation" private const val PRESET_ARG_NAME = "preset" diff --git a/libraries/tools/kotlin-maven-allopen/pom.xml b/libraries/tools/kotlin-maven-allopen/pom.xml index 1ee4f274f4c..83a9cf52a6b 100755 --- a/libraries/tools/kotlin-maven-allopen/pom.xml +++ b/libraries/tools/kotlin-maven-allopen/pom.xml @@ -5,11 +5,6 @@ 4.0.0 - ${basedir}/../../../plugins/allopen/allopen.common/src - ${basedir}/../../../plugins/allopen/allopen.k1/src - ${basedir}/../../../plugins/allopen/allopen.k2/src - ${basedir}/../../../plugins/allopen/allopen.cli/src - ${basedir}/../../../plugins/allopen/allopen.cli/resources ${basedir}/src/main/kotlin @@ -37,6 +32,11 @@ ${project.version} provided + + org.jetbrains.kotlin + kotlin-allopen-compiler-plugin + ${project.version} + org.apache.maven maven-core @@ -46,10 +46,6 @@ - - ${allopen.resources} - - org.codehaus.mojo @@ -60,10 +56,6 @@ add-source - ${allopen.common.src} - ${allopen.k1.src} - ${allopen.k2.src} - ${allopen.cli.src} ${allopen.maven.plugin.src} diff --git a/plugins/allopen/allopen.embeddable/build.gradle.kts b/plugins/allopen/allopen.embeddable/build.gradle.kts new file mode 100644 index 00000000000..7349446b853 --- /dev/null +++ b/plugins/allopen/allopen.embeddable/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + id("org.jetbrains.kotlin.jvm") +} + +dependencies { + embedded(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } +} + +publish { + artifactId = artifactId.replace(".", "-") +} + +runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) +sourcesJarWithSourcesFromEmbedded( + project(":kotlin-allopen-compiler-plugin").tasks.named("sourcesJar") +) +javadocJarWithJavadocFromEmbedded( + project(":kotlin-allopen-compiler-plugin").tasks.named("javadocJar") +) diff --git a/plugins/allopen/build.gradle.kts b/plugins/allopen/build.gradle.kts index de5344bff35..0c012c38844 100644 --- a/plugins/allopen/build.gradle.kts +++ b/plugins/allopen/build.gradle.kts @@ -41,6 +41,8 @@ sourceSets { } } +publish() + runtimeJar() sourcesJar() javadocJar() diff --git a/settings.gradle b/settings.gradle index 027dd96e827..e5005922c1b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -126,6 +126,7 @@ include ":benchmarks", ":kotlin-android-extensions-runtime" include ":kotlin-allopen-compiler-plugin", + ":kotlin-allopen-compiler-plugin.embeddable", ":kotlin-allopen-compiler-plugin.common", ":kotlin-allopen-compiler-plugin.k1", ":kotlin-allopen-compiler-plugin.k2", @@ -665,6 +666,7 @@ project(':kotlin-parcelize-compiler').projectDir = "$rootDir/prepare/parcelize-c project(':kotlin-android-extensions-runtime').projectDir = "$rootDir/plugins/android-extensions/android-extensions-runtime" as File project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen" as File +project(":kotlin-allopen-compiler-plugin.embeddable").projectDir = "$rootDir/plugins/allopen/allopen.embeddable" as File project(':kotlin-allopen-compiler-plugin.common').projectDir = "$rootDir/plugins/allopen/allopen.common" as File project(':kotlin-allopen-compiler-plugin.k1').projectDir = "$rootDir/plugins/allopen/allopen.k1" as File project(':kotlin-allopen-compiler-plugin.k2').projectDir = "$rootDir/plugins/allopen/allopen.k2" as File