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

Revert "Revert "Temporary workaround for failing tests on teamcity.""

Browse Source 
This reverts commit 2c51799e0a.
This commit is contained in:
Victor Petukhov
2021-12-27 15:56:59 +03:00
parent 9c225c5b56
commit 29f174f074
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/JavaTypeEnhancementStateParser.kt
+1 -1
View File
@@ -202,7 +202,7 @@ class JavaTypeEnhancementStateParser(
}
companion object {
private val DEFAULT = JavaTypeEnhancementStateParser(MessageCollector.NONE, KotlinVersion.CURRENT)
private val DEFAULT = JavaTypeEnhancementStateParser(MessageCollector.NONE, KotlinVersion(1, 6, 20))
private const val NULLABILITY_ANNOTATIONS_COMPILER_OPTION = "-Xnullability-annotations"
fun parsePlainNullabilityAnnotationReportLevels(nullabilityAnnotations: String): Pair<FqName, ReportLevel> =
core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
+1 -1
View File
@@ -72,7 +72,7 @@ fun getDefaultReportLevelForAnnotation(annotationFqName: FqName) =
fun getReportLevelForAnnotation(
annotation: FqName,
configuredReportLevels: NullabilityAnnotationStates<ReportLevel>,
configuredKotlinVersion: KotlinVersion = KotlinVersion.CURRENT
configuredKotlinVersion: KotlinVersion = KotlinVersion(1, 6, 20)
): ReportLevel {
configuredReportLevels[annotation]?.let { return it }