From b033b9a48d23f78fb3724d9c908228ce9b0e4888 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Mon, 9 May 2022 16:40:42 +0200 Subject: [PATCH] Introduce kotlin-dist-for-jps-meta maven artifact ^KTIJ-20875 Fixed This artifact is used to denote maven artifacts from which IDEA Kotlin plugin should compose kotlinc dist layout to use it in unbundled JPS (KTIJ-11633) Right now kotlin-dist-for-jps-meta tries as close as possible to a real dist except for: ``` js.engines.jar kotlin-ant.jar kotlin-preloader.jar mutability-annotations-compat.jar // It's compiler/cli/cli-runner. // It is `kotlin` in CLI and not needed for JPS kotlin-runner.jar // JPS doesn't support KAPT kotlin-annotation-processing-cli.jar // Sources kotlin-annotations-jvm-sources.jar kotlin-reflect-sources.jar kotlin-script-runtime-sources.jar kotlin-stdlib-jdk7-sources.jar kotlin-stdlib-jdk8-sources.jar kotlin-stdlib-js-sources.jar kotlin-stdlib-sources.jar kotlin-test-js-sources.jar kotlin-test-junit5-sources.jar kotlin-test-junit-sources.jar kotlin-test-sources.jar kotlin-test-testng-sources.jar ``` ^ for elaboration on the list see KTIJ-20875 This commit is going to be cherry-picked to a bunch of old Kotlin versions, so it needs to be conservative Alternative fix: I could create a Gradle module but I didn't do that, because I can't refer to compiler plugin maven modules which are also specified in Maven poms `libraries/tools/kotlin-maven-*/pom.xml`. 1. `api(project(":kotlin-maven-allopen"))` in imaginary Gradle fix obviously doesn't work 2. `api("org.jetbrains.kotlin:kotlin-maven-noarg:${project.version}")` kinda works... but at least breaks IDE import (most probably, it breaks something else as well) --- libraries/pom.xml | 1 + .../tools/kotlin-dist-for-jps-meta/pom.xml | 227 ++++++++++++++++++ 2 files changed, 228 insertions(+) create mode 100644 libraries/tools/kotlin-dist-for-jps-meta/pom.xml diff --git a/libraries/pom.xml b/libraries/pom.xml index 7cc668f1c0a..3cbffa44a3e 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -87,6 +87,7 @@ tools/kotlin-maven-lombok tools/kotlin-bom + tools/kotlin-dist-for-jps-meta tools/kotlin-maven-plugin-test diff --git a/libraries/tools/kotlin-dist-for-jps-meta/pom.xml b/libraries/tools/kotlin-dist-for-jps-meta/pom.xml new file mode 100644 index 00000000000..c728283ec81 --- /dev/null +++ b/libraries/tools/kotlin-dist-for-jps-meta/pom.xml @@ -0,0 +1,227 @@ + + + + 4.0.0 + + kotlin-dist-for-jps-meta + pom + + + kotlin-project + org.jetbrains.kotlin + 1.7.255-SNAPSHOT + ../../pom.xml + + + Kotlin Dist For Jps Meta + Kotlin Dist For Jps Meta + https://kotlinlang.org/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + scm:git:https://github.com/JetBrains/kotlin.git + scm:git:https://github.com/JetBrains/kotlin.git + https://github.com/JetBrains/kotlin + + + + + Kotlin Team + JetBrains + https://www.jetbrains.com + + + + + + ${project.groupId} + jvm-abi-gen + ${project.version} + + + ${project.groupId} + kotlin-android-extensions-runtime + ${project.version} + + + ${project.groupId} + kotlin-android-extensions + ${project.version} + + + ${project.groupId} + kotlin-annotation-processing-runtime + ${project.version} + + + ${project.groupId} + kotlin-annotation-processing + ${project.version} + + + ${project.groupId} + kotlin-annotations-jvm + ${project.version} + + + ${project.groupId} + kotlin-compiler + ${project.version} + + + ${project.groupId} + kotlin-daemon-client + ${project.version} + + + ${project.groupId} + kotlin-daemon + ${project.version} + + + ${project.groupId} + kotlin-main-kts + ${project.version} + + + ${project.groupId} + kotlin-parcelize-compiler + ${project.version} + + + ${project.groupId} + kotlin-parcelize-runtime + ${project.version} + + + ${project.groupId} + kotlin-reflect + ${project.version} + + + ${project.groupId} + kotlin-script-runtime + ${project.version} + + + ${project.groupId} + kotlin-scripting-common + ${project.version} + + + ${project.groupId} + kotlin-scripting-compiler-impl + ${project.version} + + + ${project.groupId} + kotlin-scripting-compiler + ${project.version} + + + ${project.groupId} + kotlin-scripting-js + ${project.version} + + + ${project.groupId} + kotlin-scripting-jvm + ${project.version} + + + ${project.groupId} + kotlin-stdlib-jdk7 + ${project.version} + + + ${project.groupId} + kotlin-stdlib-jdk8 + ${project.version} + + + ${project.groupId} + kotlin-stdlib-js + ${project.version} + + + ${project.groupId} + kotlin-stdlib + ${project.version} + + + ${project.groupId} + kotlin-test-js + ${project.version} + + + ${project.groupId} + kotlin-test-junit5 + ${project.version} + + + ${project.groupId} + kotlin-test-junit + ${project.version} + + + ${project.groupId} + kotlin-test-testng + ${project.version} + + + ${project.groupId} + kotlin-test + ${project.version} + + + org.jetbrains.intellij.deps + trove4j + 1.0.20200330 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + 1.5.0 + + + org.jetbrains + annotations + 13.0 + + + + + ${project.groupId} + kotlin-maven-serialization + ${project.version} + + + ${project.groupId} + kotlin-maven-sam-with-receiver + ${project.version} + + + ${project.groupId} + kotlin-maven-allopen + ${project.version} + + + ${project.groupId} + kotlin-maven-lombok + ${project.version} + + + ${project.groupId} + kotlin-maven-noarg + ${project.version} + + + \ No newline at end of file