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

Sort source to output mapping before writing to caches

Browse Source 
#KT-32902 Fixed
This commit is contained in:
Alexey Tsvetkov
2019-07-24 14:54:12 +03:00
parent afa10cc125
commit 4b9a852745
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/build/generatedFiles.kt
+4 -2
View File
@@ -22,9 +22,11 @@ import org.jetbrains.kotlin.utils.sure
import java.io.File import java.io.File
open class GeneratedFile( open class GeneratedFile(
val sourceFiles: Collection<File>, sourceFiles: Collection<File>,
val outputFile: File val outputFile: File
) ) {
val sourceFiles = sourceFiles.sortedBy { it.path }
}
class GeneratedJvmClass ( class GeneratedJvmClass (
sourceFiles: Collection<File>, sourceFiles: Collection<File>,
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+3 -1
View File
@@ -635,7 +635,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
} }
?: representativeTarget ?: representativeTarget
return outputItemCollector.outputs.groupBy(SimpleOutputItem::target, SimpleOutputItem::toGeneratedFile) return outputItemCollector.outputs
.sortedBy { it.outputFile }
.groupBy(SimpleOutputItem::target, SimpleOutputItem::toGeneratedFile)
} }
private fun updateLookupStorage( private fun updateLookupStorage(