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

Revert "Temporary workaround for failing tests on teamcity."

Browse Source 
This reverts commit 2436ca3d8b.
This commit is contained in:
Victor Petukhov
2021-12-23 10:27:26 +03:00
committed by teamcity
parent 6c02ef0a44
commit 2c51799e0a
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 { companion object {
private val DEFAULT = JavaTypeEnhancementStateParser(MessageCollector.NONE, KotlinVersion(1, 6, 20)) private val DEFAULT = JavaTypeEnhancementStateParser(MessageCollector.NONE, KotlinVersion.CURRENT)
private const val NULLABILITY_ANNOTATIONS_COMPILER_OPTION = "-Xnullability-annotations" private const val NULLABILITY_ANNOTATIONS_COMPILER_OPTION = "-Xnullability-annotations"
fun parsePlainNullabilityAnnotationReportLevels(nullabilityAnnotations: String): Pair<FqName, ReportLevel> = 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( fun getReportLevelForAnnotation(
annotation: FqName, annotation: FqName,
configuredReportLevels: NullabilityAnnotationStates<ReportLevel>, configuredReportLevels: NullabilityAnnotationStates<ReportLevel>,
configuredKotlinVersion: KotlinVersion = KotlinVersion(1, 6, 20) configuredKotlinVersion: KotlinVersion = KotlinVersion.CURRENT
): ReportLevel { ): ReportLevel {
configuredReportLevels[annotation]?.let { return it } configuredReportLevels[annotation]?.let { return it }