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

Fix JPS classpath

Browse Source
This commit is contained in:
Simon Ogorodnik
2017-09-06 18:30:42 +03:00
committed by Ilya Chernikov
parent a63d1a53c3
commit 129dc42a25
13 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -306,7 +306,7 @@ tasks {
"android-tests" {
dependsOn("dist")
dependsOn(":plugins:android-extensions-idea:test",
dependsOn(":plugins:android-extensions-ide:test",
":idea:idea-android:test",
":kotlin-annotation-processing:test",
":compiler:android-tests:test")
generators/build.gradle.kts
+1 -1
View File
@@ -27,7 +27,7 @@ dependencies {
compile(projectTests(":idea:idea-android"))
compile(projectTests(":jps-plugin"))
compile(projectTests(":plugins:plugins-tests"))
compile(projectTests(":plugins:android-extensions-idea"))
compile(projectTests(":plugins:android-extensions-ide"))
compile(projectTests(":kotlin-annotation-processing"))
compile(projectTests(":plugins:uast-kotlin"))
compile(projectTests(":js:js.tests"))
gradle/project-schema.json
+1 -1
View File
@@ -3534,7 +3534,7 @@
"signing": "org.gradle.plugins.signing.SigningExtension"
}
},
":plugins:android-extensions-idea": {
":plugins:android-extensions-ide": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
idea-runner/build.gradle.kts
+2 -2
View File
@@ -23,7 +23,7 @@ val runIde by task<JavaExec> {
workingDir = File(rootDir, "ideaSDK", "bin")
val pluginPath = File(rootDir, "dist", "artifacts", "Kotlin")
val ideaPluginDir: File by rootProject.extra
jvmArgs(
"-Xmx1250m",
@@ -37,7 +37,7 @@ val runIde by task<JavaExec> {
"-Dapple.laf.useScreenMenuBar=true",
"-Dapple.awt.graphics.UseQuartz=true",
"-Dsun.io.useCanonCaches=false",
"-Dplugin.path=${pluginPath.absolutePath}",
"-Dplugin.path=${ideaPluginDir.absolutePath}",
"-Dkotlin.internal.mode.enabled=true",
"-Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar"
)
idea/build.gradle.kts
+1 -1
View File
@@ -67,7 +67,7 @@ dependencies {
// deps below are test runtime deps, but made test compile to split compilation and running to reduce mem req
testCompile(project(":android-extensions-compiler"))
testCompile(project(":plugins:android-extensions-idea")) { isTransitive = false }
testCompile(project(":plugins:android-extensions-ide")) { isTransitive = false }
testCompile(project(":allopen-ide-plugin")) { isTransitive = false }
testCompile(project(":kotlin-allopen-compiler-plugin"))
testCompile(project(":noarg-ide-plugin")) { isTransitive = false }
idea/idea-android/build.gradle.kts
+1 -1
View File
@@ -28,7 +28,7 @@ dependencies {
testCompile(ideaSdkDeps("gson"))
testCompile(commonDep("junit:junit"))
testRuntime(project(":plugins:android-extensions-idea"))
testRuntime(project(":plugins:android-extensions-ide"))
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
idea/idea-gradle/build.gradle.kts
+1 -1
View File
@@ -24,7 +24,7 @@ dependencies {
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":idea:idea-android"))
testRuntime(project(":plugins:android-extensions-idea"))
testRuntime(project(":plugins:android-extensions-ide"))
testRuntime(project(":plugins:lint"))
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
idea/idea-maven/build.gradle.kts
+1 -1
View File
@@ -25,7 +25,7 @@ dependencies {
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":idea:idea-android"))
testRuntime(project(":plugins:android-extensions-idea"))
testRuntime(project(":plugins:android-extensions-ide"))
testRuntime(project(":plugins:lint"))
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -388,7 +388,7 @@
<fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinBuiltInFileTypeFactory"/>
<fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinModuleFileFactory"/>
<compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-plugin.jar;android-extensions-ide.jar;android-extensions-compiler.jar"/>
<compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-stdlib.jar;kotlin-reflect.jar;kotlin-plugin.jar;android-extensions-ide.jar;android-extensions-compiler.jar"/>
<compiler.task execute="BEFORE" implementation="org.jetbrains.kotlin.idea.internal.makeBackup.MakeBackupCompileTask"/>
<buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
<jps.plugin />
j2k/build.gradle.kts
+1 -1
View File
@@ -20,7 +20,7 @@ dependencies {
testCompile(project(":compiler.tests-common"))
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":idea:idea-android"))
testRuntime(project(":plugins:android-extensions-idea"))
testRuntime(project(":plugins:android-extensions-ide"))
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
plugins/plugins-tests/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ dependencies {
testCompile(project(":compiler:cli"))
testCompile(project(":compiler.tests-common"))
testCompile(project(":android-extensions-compiler"))
testCompile(project(":plugins:android-extensions-idea"))
testCompile(project(":plugins:android-extensions-ide"))
testCompile(project(":allopen-ide-plugin")) { isTransitive = false }
testCompile(project(":kotlin-allopen-compiler-plugin"))
testCompile(project(":noarg-ide-plugin")) { isTransitive = false }
settings.gradle
+2 -2
View File
@@ -69,7 +69,7 @@ include ":kotlin-build-common",
":j2k",
":plugins:lint",
":android-extensions-compiler",
":plugins:android-extensions-idea",
":plugins:android-extensions-ide",
":plugins:android-extensions-jps",
":kotlin-allopen-compiler-plugin",
":allopen-ide-plugin",
@@ -159,7 +159,7 @@ project(':compiler:ir.ir2cfg').projectDir = "$rootDir/compiler/ir/ir.ir2cfg" as
project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File
project(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File
project(':android-extensions-compiler').projectDir = "$rootDir/plugins/android-extensions/android-extensions-compiler" as File
project(':plugins:android-extensions-idea').projectDir = "$rootDir/plugins/android-extensions/android-extensions-idea" as File
project(':plugins:android-extensions-ide').projectDir = "$rootDir/plugins/android-extensions/android-extensions-idea" as File
project(':plugins:android-extensions-jps').projectDir = "$rootDir/plugins/android-extensions/android-extensions-jps" as File
project(':android-lint').projectDir = "$rootDir/prepare/android-lint" as File
project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen/allopen-cli" as File
ultimate/build.gradle.kts
+1 -1
View File
@@ -68,7 +68,7 @@ dependencies {
testCompile(preloadedDeps("kotlinx-coroutines-core"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(project(":plugins:android-extensions-idea")) { isTransitive = false }
testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false }
testRuntime(project(":android-extensions-compiler")) { isTransitive = false }
testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
testRuntime(project(":idea:idea-android")) { isTransitive = false }