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

Build: Fix usage of jvmArgs which became nullable

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-06-09 20:34:11 +03:00
parent 4b3a989b90
commit 94c636adc3
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/build.gradle.kts
+1 -2
View File
@@ -42,7 +42,6 @@ dependencies {
compileOnly(project(":kotlin-daemon-client"))
compileOnly(intellijDep())
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
@@ -152,7 +151,7 @@ projectTest(taskName = "performanceTest") {
classpath = performanceTest.runtimeClasspath
workingDir = rootDir
jvmArgs.removeAll { it.startsWith("-Xmx") }
jvmArgs?.removeAll { it.startsWith("-Xmx") }
maxHeapSize = "3g"
jvmArgs("-XX:SoftRefLRUPolicyMSPerMB=50")
idea/build.gradle.kts.173
+8 -5
View File
@@ -101,16 +101,19 @@ dependencies {
sourceSets {
"main" {
projectDefault()
java.srcDirs("idea-completion/src",
"idea-live-templates/src",
"idea-repl/src")
java.srcDirs(
"idea-completion/src",
"idea-live-templates/src",
"idea-repl/src"
)
resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
}
"test" {
projectDefault()
java.srcDirs(
"idea-completion/tests",
"idea-live-templates/tests")
"idea-completion/tests",
"idea-live-templates/tests"
)
}
}
idea/build.gradle.kts.as31
+8 -5
View File
@@ -102,16 +102,19 @@ dependencies {
sourceSets {
"main" {
projectDefault()
java.srcDirs("idea-completion/src",
"idea-live-templates/src",
"idea-repl/src")
java.srcDirs(
"idea-completion/src",
"idea-live-templates/src",
"idea-repl/src"
)
resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
}
"test" {
projectDefault()
java.srcDirs(
"idea-completion/tests",
"idea-live-templates/tests")
"idea-completion/tests",
"idea-live-templates/tests"
)
}
}
idea/build.gradle.kts.as32
+8 -5
View File
@@ -102,16 +102,19 @@ dependencies {
sourceSets {
"main" {
projectDefault()
java.srcDirs("idea-completion/src",
"idea-live-templates/src",
"idea-repl/src")
java.srcDirs(
"idea-completion/src",
"idea-live-templates/src",
"idea-repl/src"
)
resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }
}
"test" {
projectDefault()
java.srcDirs(
"idea-completion/tests",
"idea-live-templates/tests")
"idea-completion/tests",
"idea-live-templates/tests"
)
}
}