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

Turn on relocatable build cache -- change PathSensitivity to RELATIVE

Browse Source
This commit is contained in:
Sergey Igushkin
2017-12-11 20:36:29 +03:00
parent c852d0b6cb
commit 97edda44c8
3 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
+1 -1
View File
@@ -65,7 +65,7 @@ open class KaptTask : ConventionTask(), CompilerArgumentAware<K2JVMCompilerArgum
@get:Classpath @get:InputFiles @get:Classpath @get:InputFiles
internal val pluginClasspath get() = pluginOptions.classpath internal val pluginClasspath get() = pluginOptions.classpath
@get:InputFiles @get:PathSensitive(PathSensitivity.ABSOLUTE) @get:InputFiles @get:PathSensitive(PathSensitivity.RELATIVE)
val source: FileCollection val source: FileCollection
get() { get() {
val sourcesFromKotlinTask = kotlinCompileTask.source val sourcesFromKotlinTask = kotlinCompileTask.source
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+1 -1
View File
@@ -830,7 +830,7 @@ internal class SubpluginEnvironment(
} }
} }
private val fileOptionsPathSensitivity = PathSensitivity.ABSOLUTE private val fileOptionsPathSensitivity = PathSensitivity.RELATIVE
internal fun Task.registerSubpluginOptionAsInput(subpluginId: String, option: SubpluginOption) { internal fun Task.registerSubpluginOptionAsInput(subpluginId: String, option: SubpluginOption) {
when (option) { when (option) {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+2 -2
View File
@@ -63,7 +63,7 @@ abstract class AbstractKotlinCompileTool<T : CommonToolArguments>() : AbstractCo
var compilerClasspath: List<File>? = null var compilerClasspath: List<File>? = null
@InputFiles @InputFiles
@PathSensitive(PathSensitivity.ABSOLUTE) @PathSensitive(PathSensitivity.RELATIVE)
override fun getSource() = super.getSource() override fun getSource() = super.getSource()
@get:Classpath @get:InputFiles @get:Classpath @get:InputFiles
@@ -473,7 +473,7 @@ open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArguments>(),
@get:InputFiles @get:InputFiles
@get:Optional @get:Optional
@get:PathSensitive(PathSensitivity.ABSOLUTE) @get:PathSensitive(PathSensitivity.RELATIVE)
internal val friendDependency internal val friendDependency
get() = friendTaskName get() = friendTaskName
?.let { project.getTasksByName(it, false).singleOrNull() as? Kotlin2JsCompile } ?.let { project.getTasksByName(it, false).singleOrNull() as? Kotlin2JsCompile }