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

Make project compilable after types enhancement

Browse Source 
Original commit: 0a19fb7df2
This commit is contained in:
Denis Zharkov
2015-07-08 12:13:24 +03:00
parent 22c07485dd
commit e4a96670f4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+2 -2
View File
@@ -150,14 +150,14 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen
val decision = when {
header.isCompatiblePackageFacadeKind() ->
getRecompilationDecision(
protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)),
protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!)),
constantsChanged = false,
inlinesChanged = false
)
header.isCompatibleClassKind() ->
when (header.classKind!!) {
JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision(
protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)),
protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!)),
constantsChanged = constantsMap.process(className, fileBytes),
inlinesChanged = inlineFunctionsMap.process(className, fileBytes)
)
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+1 -1
View File
@@ -292,7 +292,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
val mapping = project.dataManager.getSourceToOutputMap(target)
mapping.getSources().forEach {
val outputs = mapping.getOutputs(it).sort()
val outputs = mapping.getOutputs(it)!!.sort()
if (outputs.isNotEmpty()) {
result.println("source $it -> " + outputs)
}