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

Minor: use properties instead of string constants

Browse Source
This commit is contained in:
Natalia Selezneva
2019-10-31 11:10:03 +03:00
parent 9d2cc484aa
commit f0053ee34c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleBuildScriptsResolver.kt
+8 -2
View File
@@ -12,6 +12,7 @@ import com.intellij.openapi.util.Pair
import com.intellij.util.Consumer import com.intellij.util.Consumer
import org.gradle.tooling.model.idea.IdeaProject import org.gradle.tooling.model.idea.IdeaProject
import org.gradle.tooling.model.kotlin.dsl.EditorReportSeverity import org.gradle.tooling.model.kotlin.dsl.EditorReportSeverity
import org.gradle.tooling.model.kotlin.dsl.KotlinDslModelsParameters.*
import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
import org.jetbrains.kotlin.idea.util.NotNullableCopyableDataNodeUserDataProperty import org.jetbrains.kotlin.idea.util.NotNullableCopyableDataNodeUserDataProperty
import org.jetbrains.plugins.gradle.model.ProjectImportExtraModelProvider import org.jetbrains.plugins.gradle.model.ProjectImportExtraModelProvider
@@ -47,11 +48,16 @@ class KotlinGradleBuildScriptsResolver : AbstractProjectResolverExtension() {
} }
override fun getExtraJvmArgs(): List<Pair<String, String>> { override fun getExtraJvmArgs(): List<Pair<String, String>> {
return listOf(Pair("-Dorg.gradle.kotlin.dsl.provider.mode", "strict-classpath")) return listOf(
Pair(
"-D$PROVIDER_MODE_SYSTEM_PROPERTY_NAME",
STRICT_CLASSPATH_MODE_SYSTEM_PROPERTY_VALUE
)
)
} }
override fun enhanceTaskProcessing(taskNames: MutableList<String>, jvmParametersSetup: String?, initScriptConsumer: Consumer<String>) { override fun enhanceTaskProcessing(taskNames: MutableList<String>, jvmParametersSetup: String?, initScriptConsumer: Consumer<String>) {
initScriptConsumer.consume("startParameter.taskNames += [\"prepareKotlinBuildScriptModel\"]") initScriptConsumer.consume("startParameter.taskNames += [\"${PREPARATION_TASK_NAME}\"]")
} }
override fun getExtraModelProvider(): ProjectImportExtraModelProvider { override fun getExtraModelProvider(): ProjectImportExtraModelProvider {