diff --git a/.space/CODEOWNERS b/.space/CODEOWNERS index 7f74ec74791..e1d14540755 100644 --- a/.space/CODEOWNERS +++ b/.space/CODEOWNERS @@ -278,8 +278,6 @@ /libraries/kotlin-dom-api-compat/ "Kotlin JS" /libraries/tools/gradle/ "Kotlin Build Tools" /libraries/tools/kotlin-allopen/ "Kotlin Build Tools" -/libraries/tools/kotlin-annotation-processing/ "Kotlin Build Tools" -/libraries/tools/kotlin-annotation-processing-maven/ "Kotlin Build Tools" /libraries/tools/kotlin-annotations-jvm/ "Kotlin Libraries" /libraries/tools/kotlin-assignment/ "Kotlin Build Tools" /libraries/tools/kotlin-bom/ "Kotlin Build Infrastructure" diff --git a/build.gradle.kts b/build.gradle.kts index 1637b1ea181..7976ad4504e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -390,7 +390,6 @@ val gradlePluginProjects = listOf( ":kotlin-gradle-plugin-kpm-android", ":kotlin-gradle-plugin-tcs-android", ":kotlin-allopen", - ":kotlin-annotation-processing-gradle", ":kotlin-noarg", ":kotlin-sam-with-receiver", ":kotlin-parcelize-compiler", diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 680256b7008..2684a51b119 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -54,7 +54,7 @@ val kotlinGradlePluginAndItsRequired = arrayOf( ":kotlin-tooling-metadata", ":kotlin-tooling-core", ":kotlin-reflect", - ":kotlin-annotation-processing-gradle", + ":kotlin-annotation-processing-embeddable", ":kotlin-test", ":kotlin-gradle-subplugin-example", ":kotlin-stdlib-common", diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index d0a8703cafd..a8d5b5658e3 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -24,7 +24,6 @@ fun updateCompilerXml() { "libraries/tools/gradle", "libraries/tools/kotlin-allopen", "libraries/tools/kotlin-annotation-processing", - "libraries/tools/kotlin-annotation-processing-maven", "libraries/tools/kotlin-assignment", "libraries/tools/kotlin-bom", "libraries/tools/kotlin-gradle-build-metrics", diff --git a/libraries/pom.xml b/libraries/pom.xml index 4d9386abc55..83fd2aaea6b 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -80,7 +80,6 @@ tools/maven-archetypes - tools/kotlin-annotation-processing-maven tools/kotlin-maven-allopen tools/kotlin-maven-noarg tools/kotlin-maven-sam-with-receiver diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml deleted file mode 100755 index 211af749d88..00000000000 --- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - 4.0.0 - - ${basedir}/../../../plugins/kapt3/kapt3-compiler/src - ${basedir}/../../../plugins/kapt3/kapt3-cli/src - ${basedir}/../../../plugins/kapt3/kapt3-compiler/resources - ${basedir}/../../../plugins/kapt3/kapt3-base/src - ${basedir}/../../../plugins/kapt3/kapt3-runtime/src - - - - org.jetbrains.kotlin - kotlin-project - 1.9.255-SNAPSHOT - ../../pom.xml - - - kotlin-annotation-processing-maven - jar - - Annotation Processor wrapper for Kotlin Maven plugin - - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - org.jetbrains.kotlin - kotlin-compiler - ${project.version} - provided - - - com.android.tools.build - gradle - 1.1.0 - provided - - - - - - ${annotation-processing.resources} - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - add-source - - - ${annotation-processing.src} - ${annotation-processing.cli.src} - ${annotation-processing.base.src} - ${annotation-processing.runtime.src} - - - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - ${jdk_1_8} - - ${basedir}/kotlinAnnotation - - - -opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi - - - - - - compile - compile - compile - - - test-compile - test-compile - test-compile - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-failsafe-plugin - 2.6 - - - - integration-test - verify - - - - - - - - - - tools_jar_profile - - false - - kotlin-annotation-processing-maven-build.txt - - - - ${jdk_1_8}/lib/tools.jar - - - - com.sun - tools - 1.8.0 - system - ${toolsjar} - - - - - diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts deleted file mode 100644 index 0cd6d7e4bc8..00000000000 --- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import org.gradle.jvm.tasks.Jar - -description = "Kapt - Annotation processing for Kotlin" - -plugins { - kotlin("jvm") -} - -val packedJars by configurations.creating - -dependencies { - api(kotlinStdlib()) - packedJars(project(":kotlin-annotation-processing")) { isTransitive = false } - runtimeOnly(project(":kotlin-compiler-embeddable")) -} - -projectTest(parallel = true) { - workingDir = projectDir -} - -publish() - -tasks.named("jar").configure { - archiveClassifier.set("base") -} - -runtimeJar(rewriteDepsToShadedCompiler( - tasks.register("shadowJar") { - from(packedJars) - } -)) - -sourcesJar() -javadocJar() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJvmApiTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJvmApiTest.kt index 5e6d2acc63b..3b4675a80f4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJvmApiTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJvmApiTest.kt @@ -87,7 +87,7 @@ class KotlinJvmApiTest : KGPBaseTest() { apiPlugin.addCompilerPluginDependency( project.provider { - "org.jetbrains.kotlin:kotlin-annotation-processing-gradle:${"$"}kotlin_version" + "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:${"$"}kotlin_version" } ) diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index e6a52822393..97e618d5303 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -41,7 +41,6 @@ dependencies { commonCompileOnly(project(":kotlin-build-common")) commonCompileOnly(project(":kotlin-compiler-runner")) commonCompileOnly(project(":kotlin-annotation-processing")) - commonCompileOnly(project(":kotlin-annotation-processing-gradle")) commonCompileOnly(project(":kotlin-scripting-compiler")) commonCompileOnly(project(":kotlin-gradle-statistics")) commonCompileOnly(project(":kotlin-gradle-build-metrics")) @@ -68,7 +67,7 @@ dependencies { commonImplementation(project(":kotlin-project-model")) commonRuntimeOnly(project(":kotlin-compiler-embeddable")) - commonRuntimeOnly(project(":kotlin-annotation-processing-gradle")) + commonRuntimeOnly(project(":kotlin-annotation-processing-embeddable")) commonRuntimeOnly(project(":kotlin-android-extensions")) commonRuntimeOnly(project(":kotlin-compiler-runner")) { // Excluding dependency with not-relocated 'com.intellij' types @@ -91,7 +90,6 @@ dependencies { testCompileOnly(project(":compiler")) testCompileOnly(project(":kotlin-annotation-processing")) - testCompileOnly(project(":kotlin-annotation-processing-gradle")) testImplementation(commonDependency("org.jetbrains.teamcity:serviceMessages")) testImplementation(projectTests(":kotlin-build-common")) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt index 0eea1aa6961..98f68086e94 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt @@ -71,7 +71,7 @@ class Kapt3GradleSubplugin @Inject internal constructor(private val registry: To val MAIN_KAPT_CONFIGURATION_NAME = "kapt" - const val KAPT_ARTIFACT_NAME = "kotlin-annotation-processing-gradle" + const val KAPT_ARTIFACT_NAME = "kotlin-annotation-processing-embeddable" val KAPT_SUBPLUGIN_ID = "org.jetbrains.kotlin.kapt3" fun getKaptConfigurationName(sourceSetName: String): String { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KaptConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KaptConfig.kt index 6eb13e9ee79..be0c0146f8d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KaptConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KaptConfig.kt @@ -186,7 +186,7 @@ internal class KaptWithoutKotlincConfig : KaptConfig { project.configurations.findByName(Kapt3GradleSubplugin.KAPT_WORKER_DEPENDENCIES_CONFIGURATION_NAME) ?: project.configurations.create(Kapt3GradleSubplugin.KAPT_WORKER_DEPENDENCIES_CONFIGURATION_NAME).apply { dependencies.addAllLater(project.listProperty { - val kaptDependency = "org.jetbrains.kotlin:kotlin-annotation-processing-gradle:${project.getKotlinPluginVersion()}" + val kaptDependency = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:${project.getKotlinPluginVersion()}" listOf( project.dependencies.create(kaptDependency), project.dependencies.kotlinDependency( diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 634f55ba5e5..1dc21bf34fd 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -117,12 +117,12 @@ local-repo + org.jetbrains.kotlin:kotlin-annotation-processing:${project.version} org.jetbrains.kotlin:kotlin-maven-plugin:${project.version} org.jetbrains.kotlin:kotlin-maven-allopen:${project.version} org.jetbrains.kotlin:kotlin-maven-noarg:${project.version} org.jetbrains.kotlin:kotlin-maven-lombok:${project.version} org.jetbrains.kotlin:kotlin-maven-sam-with-receiver:${project.version} - org.jetbrains.kotlin:kotlin-annotation-processing-maven:${project.version} org.jetbrains.kotlin:kotlin-script-runtime:${project.version} org.jetbrains.kotlin:kotlin-stdlib:${project.version} org.jetbrains.kotlin:kotlin-stdlib-common:${project.version} diff --git a/libraries/tools/kotlin-annotation-processing-maven/kotlin-annotation-processing-maven-build.txt b/libraries/tools/kotlin-maven-plugin/kotlin-annotation-processing-maven-build.txt similarity index 100% rename from libraries/tools/kotlin-annotation-processing-maven/kotlin-annotation-processing-maven-build.txt rename to libraries/tools/kotlin-maven-plugin/kotlin-annotation-processing-maven-build.txt diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml index d8ee24211aa..a4426f48d98 100644 --- a/libraries/tools/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -154,5 +154,27 @@ + + + tools_jar_profile + + false + + kotlin-annotation-processing-maven-build.txt + + + + ${jdk_1_8}/lib/tools.jar + + + + com.sun + tools + 1.8.0 + system + ${toolsjar} + + + diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/AnnotationProcessingManager.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/AnnotationProcessingManager.java index 7cd072511e2..594687f1e64 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/AnnotationProcessingManager.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/AnnotationProcessingManager.java @@ -63,7 +63,7 @@ public class AnnotationProcessingManager { static { KAPT_DEPENDENCY.setGroupId("org.jetbrains.kotlin"); - KAPT_DEPENDENCY.setArtifactId("kotlin-annotation-processing-maven"); + KAPT_DEPENDENCY.setArtifactId("kotlin-annotation-processing"); try { KAPT_DEPENDENCY.setVersion(getMavenPluginVersion()); } diff --git a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts b/plugins/kapt3/kotlin-annotation-processing-embeddable/build.gradle.kts similarity index 93% rename from prepare/kotlin-annotation-processing-embeddable/build.gradle.kts rename to plugins/kapt3/kotlin-annotation-processing-embeddable/build.gradle.kts index c1a743b1659..9f2ae7cec53 100644 --- a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts +++ b/plugins/kapt3/kotlin-annotation-processing-embeddable/build.gradle.kts @@ -1,7 +1,7 @@ description = "Annotation Processor for Kotlin (for using with embeddable compiler)" plugins { - java + `java-library` } dependencies { @@ -11,7 +11,5 @@ dependencies { publish() runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) - sourcesJar() - javadocJar() diff --git a/settings.gradle b/settings.gradle index e5150facae8..233d44c1011 100644 --- a/settings.gradle +++ b/settings.gradle @@ -222,7 +222,6 @@ include ":kotlin-imports-dumper-compiler-plugin", ":kotlin-annotation-processing-cli", ":kotlin-annotation-processing-base", ":kotlin-annotation-processing-runtime", - ":kotlin-annotation-processing-gradle", ":kotlin-annotation-processing-embeddable", ":kotlin-daemon-embeddable", ":examples:kotlin-jsr223-local-example", @@ -740,8 +739,7 @@ project(':kotlin-lombok').projectDir = "$rootDir/libraries/tools/kotlin-lombok" project(':kotlin-gradle-subplugin-example').projectDir = "$rootDir/libraries/examples/kotlin-gradle-subplugin-example" as File project(':examples:annotation-processor-example').projectDir = "$rootDir/libraries/examples/annotation-processor-example" as File project(':kotlin-script-util').projectDir = "$rootDir/libraries/tools/kotlin-script-util" as File -project(':kotlin-annotation-processing-gradle').projectDir = "$rootDir/libraries/tools/kotlin-annotation-processing" as File -project(':kotlin-annotation-processing-embeddable').projectDir = "$rootDir/prepare/kotlin-annotation-processing-embeddable" as File +project(':kotlin-annotation-processing-embeddable').projectDir = "$rootDir/plugins/kapt3/kotlin-annotation-processing-embeddable" as File project(':kotlin-daemon-embeddable').projectDir = "$rootDir/prepare/kotlin-daemon-embeddable" as File project(':kotlin-annotation-processing').projectDir = "$rootDir/plugins/kapt3/kapt3-compiler" as File project(':kotlin-annotation-processing-cli').projectDir = "$rootDir/plugins/kapt3/kapt3-cli" as File