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

Minor: rename property AbstractKotlinCompile.experimentalIncremental->incremental

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-03-30 03:04:59 +03:00
parent 61814eb23f
commit 71135b9528
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+6 -4
View File
@@ -63,7 +63,9 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractCo
} }
abstract protected fun populateTargetSpecificArgs(args: T) abstract protected fun populateTargetSpecificArgs(args: T)
var experimentalIncremental: Boolean = false // indicates that task should compile kotlin incrementally if possible
// it's not possible when IncrementalTaskInputs#isIncremental returns false (i.e first build)
var incremental: Boolean = false
var kotlinOptions: T = createBlankArgs() var kotlinOptions: T = createBlankArgs()
var kotlinDestinationDir: File? = destinationDir var kotlinDestinationDir: File? = destinationDir
var compilerCalled: Boolean = false var compilerCalled: Boolean = false
@@ -226,7 +228,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
fun projectRelativePath(f: File) = f.toRelativeString(project.projectDir) fun projectRelativePath(f: File) = f.toRelativeString(project.projectDir)
if (experimentalIncremental) { if (incremental) {
// TODO: consider other ways to pass incremental flag to compiler/builder // TODO: consider other ways to pass incremental flag to compiler/builder
System.setProperty("kotlin.incremental.compilation", "true") System.setProperty("kotlin.incremental.compilation", "true")
// TODO: experimental should be removed as soon as it becomes standard // TODO: experimental should be removed as soon as it becomes standard
@@ -300,7 +302,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
} }
fun calculateSourcesToCompile(): Pair<Set<File>, Boolean> { fun calculateSourcesToCompile(): Pair<Set<File>, Boolean> {
if (!experimentalIncremental if (!incremental
|| !isIncrementalRequested || !isIncrementalRequested
// TODO: more precise will be not to rebuild unconditionally on classpath changes, but retrieve lookup info and try to find out which sources are affected by cp changes // TODO: more precise will be not to rebuild unconditionally on classpath changes, but retrieve lookup info and try to find out which sources are affected by cp changes
|| isClassPathChanged() || isClassPathChanged()
@@ -351,7 +353,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
} }
} }
if (!experimentalIncremental) { if (!incremental) {
anyClassesCompiled = true anyClassesCompiled = true
processCompilerExitCode(compileNotIncremental(sources, outputDir, args)) processCompilerExitCode(compileNotIncremental(sources, outputDir, args))
return return
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+1 -1
View File
@@ -10,7 +10,7 @@ fun mapKotlinTaskProperties(project: Project, task: AbstractCompile) {
} }
private val propertyMappings = listOf( private val propertyMappings = listOf(
KotlinPropertyMapping("kotlin.incremental", "experimentalIncremental", String::toBoolean) KotlinPropertyMapping("kotlin.incremental", "incremental", String::toBoolean)
) )
private class KotlinPropertyMapping<T>( private class KotlinPropertyMapping<T>(