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

Support rxjava 3 nullability annotations

Browse Source
This commit is contained in:
Victor Petukhov
2021-06-02 17:23:04 +03:00
parent 6d3badb2cd
commit f46dc713d7
11 changed files with 305 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt
+4 -2
View File
@@ -35,7 +35,8 @@ val NULLABLE_ANNOTATIONS = listOf(
FqName("edu.umd.cs.findbugs.annotations.CheckForNull"),
FqName("edu.umd.cs.findbugs.annotations.Nullable"),
FqName("edu.umd.cs.findbugs.annotations.PossiblyNull"),
FqName("io.reactivex.annotations.Nullable")
FqName("io.reactivex.annotations.Nullable"),
FqName("io.reactivex.rxjava3.annotations.Nullable")
)
val JAVAX_NONNULL_ANNOTATION = FqName("javax.annotation.Nonnull")
@@ -51,7 +52,8 @@ val NOT_NULL_ANNOTATIONS = listOf(
FqName("org.eclipse.jdt.annotation.NonNull"),
FqName("org.checkerframework.checker.nullness.qual.NonNull"),
FqName("lombok.NonNull"),
FqName("io.reactivex.annotations.NonNull")
FqName("io.reactivex.annotations.NonNull"),
FqName("io.reactivex.rxjava3.annotations.NonNull")
)
val COMPATQUAL_NULLABLE_ANNOTATION = FqName("org.checkerframework.checker.nullness.compatqual.NullableDecl")
core/util.runtime/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
+5
View File
@@ -37,6 +37,11 @@ val nullabilityAnnotationSettings = mapOf(
sinceVersion = KotlinVersion(1, 6),
reportLevelAfter = ReportLevel.STRICT
),
FqName("io.reactivex.rxjava3.annotations") to JavaNullabilityAnnotationsStatus(
reportLevelBefore = ReportLevel.WARN,
sinceVersion = KotlinVersion(1, 7),
reportLevelAfter = ReportLevel.STRICT
),
)
private val jsr305Settings = JavaNullabilityAnnotationsStatus(