diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt index e3e2a5aa1aa..50f120ef327 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/nullabilityUtils.kt @@ -56,11 +56,11 @@ private fun FirAnnotationCall.extractNullabilityFromKnownAnnotations(javaTypeEnh COMPATQUAL_NONNULL_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL) ANDROIDX_RECENTLY_NON_NULL_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus( NullabilityQualifier.NOT_NULL, - isForWarningOnly = true + isForWarningOnly = reportLevel.isWarning ) ANDROIDX_RECENTLY_NULLABLE_ANNOTATION_ID -> NullabilityQualifierWithMigrationStatus( NullabilityQualifier.NULLABLE, - isForWarningOnly = true + isForWarningOnly = reportLevel.isWarning ) else -> null } diff --git a/core/util.runtime/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt b/core/util.runtime/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt index 102eefcdcbc..6093d21dda1 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt @@ -23,6 +23,14 @@ val nullabilityAnnotationSettings = mapOf( FqName("javax.annotation") to JavaNullabilityAnnotationsStatus.DEFAULT, FqName("edu.umd.cs.findbugs.annotations") to JavaNullabilityAnnotationsStatus.DEFAULT, FqName("io.reactivex.annotations") to JavaNullabilityAnnotationsStatus.DEFAULT, + FqName("androidx.annotation.RecentlyNullable") to JavaNullabilityAnnotationsStatus( + reportLevelBefore = ReportLevel.WARN, + sinceVersion = null + ), + FqName("androidx.annotation.RecentlyNonNull") to JavaNullabilityAnnotationsStatus( + reportLevelBefore = ReportLevel.WARN, + sinceVersion = null + ), FqName("lombok") to JavaNullabilityAnnotationsStatus.DEFAULT, JSPECIFY_ANNOTATIONS_PACKAGE to JavaNullabilityAnnotationsStatus( reportLevelBefore = ReportLevel.WARN,