azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix JPS build after removal of IDE plugin from repo

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-06-28 10:56:10 +03:00
committed by TeamCityServer
parent b76cbdaa41
commit c4d9945782
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/jps.gradle.kts
-6
View File
@@ -155,8 +155,6 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
settings { settings {
ideArtifacts { ideArtifacts {
kotlinCompilerJar() kotlinCompilerJar()
kotlinPluginJar()
kotlinReflectJar() kotlinReflectJar()
@@ -168,12 +166,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
kotlinDaemonClientJar() kotlinDaemonClientJar()
kotlinJpsPluginJar()
kotlinc() kotlinc()
ideaPlugin()
dist() dist()
} }
settings.gradle
+26 -24
View File
@@ -294,30 +294,32 @@ include ":plugins:parcelize:parcelize-compiler",
include ":plugins:lombok:lombok-compiler-plugin", include ":plugins:lombok:lombok-compiler-plugin",
":kotlin-lombok" ":kotlin-lombok"
include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide", if (!buildProperties.inJpsBuildIdeaSync) {
":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide", include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide", ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide", ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide",
":prepare:ide-plugin-dependencies:js-ir-runtime-for-ide", ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide",
":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide", ":prepare:ide-plugin-dependencies:js-ir-runtime-for-ide",
":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide", ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide",
":prepare:ide-plugin-dependencies:kotlin-compiler-cli-for-ide", ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide",
":prepare:ide-plugin-dependencies:kotlin-dist-for-ide", ":prepare:ide-plugin-dependencies:kotlin-compiler-cli-for-ide",
":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide", ":prepare:ide-plugin-dependencies:kotlin-dist-for-ide",
":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide",
":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:sam-with-receiver-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:sam-with-receiver-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:tests-common-tests-for-ide", ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:compiler-components-for-jps", ":prepare:ide-plugin-dependencies:tests-common-tests-for-ide",
":prepare:ide-plugin-dependencies:kotlin-compiler-testdata-for-ide", ":prepare:ide-plugin-dependencies:compiler-components-for-jps",
":prepare:ide-plugin-dependencies:kotlin-stdlib-minimal-for-test-for-ide", ":prepare:ide-plugin-dependencies:kotlin-compiler-testdata-for-ide",
":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide", ":prepare:ide-plugin-dependencies:kotlin-stdlib-minimal-for-test-for-ide",
":prepare:ide-plugin-dependencies:low-level-api-fir-for-ide", ":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide",
":prepare:ide-plugin-dependencies:high-level-api-for-ide", ":prepare:ide-plugin-dependencies:low-level-api-fir-for-ide",
":prepare:ide-plugin-dependencies:high-level-api-fir-for-ide", ":prepare:ide-plugin-dependencies:high-level-api-for-ide",
":prepare:ide-plugin-dependencies:high-level-api-fir-tests-for-ide" ":prepare:ide-plugin-dependencies:high-level-api-fir-for-ide",
":prepare:ide-plugin-dependencies:high-level-api-fir-tests-for-ide"
}
void kotlinIde(String imlPath) { void kotlinIde(String imlPath) {
File imlFile = new File("kotlin-ide/kotlin/${imlPath}") File imlFile = new File("kotlin-ide/kotlin/${imlPath}")