[213] Switch to 213 platform
KTI-1114
This commit is contained in:
committed by
Space Team
parent
7f07b2a82c
commit
d4cffb8a5a
+4
-4
@@ -30,8 +30,8 @@ internal class NullabilityAnnotationsTracker : AnnotationsChangeTracker() {
|
||||
.toTypedArray()
|
||||
|
||||
override fun methodAnnotationsChanged(
|
||||
context: DependencyContext,
|
||||
method: MethodRepr,
|
||||
context: NamingContext,
|
||||
method: ProtoMethodEntity,
|
||||
annotationsDiff: Difference.Specifier<ClassType, Difference>,
|
||||
paramAnnotationsDiff: Difference.Specifier<ParamAnnotation, Difference>
|
||||
): Set<Recompile> {
|
||||
@@ -43,7 +43,7 @@ internal class NullabilityAnnotationsTracker : AnnotationsChangeTracker() {
|
||||
|
||||
override fun fieldAnnotationsChanged(
|
||||
context: NamingContext,
|
||||
field: FieldRepr,
|
||||
field: ProtoFieldEntity,
|
||||
annotationsDiff: Difference.Specifier<ClassType, Difference>
|
||||
): Set<Recompile> {
|
||||
return handleNullAnnotationsChanges(context, field, annotationsDiff.addedOrRemoved())
|
||||
@@ -51,7 +51,7 @@ internal class NullabilityAnnotationsTracker : AnnotationsChangeTracker() {
|
||||
|
||||
private fun handleNullAnnotationsChanges(
|
||||
context: NamingContext,
|
||||
protoMember: ProtoMember,
|
||||
protoMember: ProtoEntity,
|
||||
annotations: Sequence<TypeRepr.ClassType>
|
||||
): Set<Recompile> {
|
||||
val n = this.annotations.size
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.jps.build
|
||||
|
||||
import com.intellij.openapi.util.io.FileFilters
|
||||
import org.jetbrains.jps.builders.AdditionalRootsProviderService
|
||||
import org.jetbrains.jps.builders.BuildTarget
|
||||
import org.jetbrains.jps.builders.java.ResourceRootDescriptor
|
||||
@@ -34,7 +35,8 @@ class KotlinResourcesRootProvider : AdditionalRootsProviderService<ResourceRootD
|
||||
it.file,
|
||||
target,
|
||||
it.properties.packagePrefix,
|
||||
setOf()
|
||||
setOf(),
|
||||
FileFilters.EVERYTHING,
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.jps.build
|
||||
|
||||
import com.intellij.openapi.util.io.FileFilters
|
||||
import org.jetbrains.jps.builders.AdditionalRootsProviderService
|
||||
import org.jetbrains.jps.builders.BuildTarget
|
||||
import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
|
||||
@@ -47,7 +48,8 @@ class KotlinSourceRootProvider : AdditionalRootsProviderService<JavaSourceRootDe
|
||||
false,
|
||||
false,
|
||||
it.properties.packagePrefix,
|
||||
setOf()
|
||||
setOf(),
|
||||
FileFilters.EVERYTHING,
|
||||
)
|
||||
)
|
||||
}
|
||||
@@ -109,4 +111,4 @@ class KotlinIncludedModuleSourceRoot(
|
||||
isTemp: Boolean,
|
||||
packagePrefix: String,
|
||||
excludes: Set<File>
|
||||
) : JavaSourceRootDescriptor(root, target, isGenerated, isTemp, packagePrefix, excludes)
|
||||
) : JavaSourceRootDescriptor(root, target, isGenerated, isTemp, packagePrefix, excludes, FileFilters.EVERYTHING)
|
||||
@@ -381,7 +381,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
|
||||
if (!cache.isMultifileFacade(className)) return emptySet()
|
||||
|
||||
val name = previousMappings.getName(className.internalName)
|
||||
return previousMappings.getClassSources(name)?.toSet() ?: emptySet()
|
||||
return previousMappings.getClassSources(name).toSet()
|
||||
}
|
||||
|
||||
for ((target, outputs) in outputItems) {
|
||||
|
||||
Reference in New Issue
Block a user