Merge pull request #107 from serjsysoev/remove-redundant

Remove annotation targets that were not there before, cleanup
JetBrains · Jun 5, 2024 · bf48b41 · bf48b41
2 parents 8dded6b + 31c2564
commit bf48b41
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 278 deletions.
diff --git a/multiplatform-annotations/build.gradle.kts b/multiplatform-annotations/build.gradle.kts
@@ -70,7 +70,6 @@ kotlin {
         compilations.all {
             compilerOptions.configure {
                 freeCompilerArgs.add("-XXLanguage:-EnumEntries")
-                freeCompilerArgs.add("-Xexpect-actual-classes")
             }
         }
     }

diff --git a/...iplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt b/...iplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt
@@ -64,5 +64,5 @@ package org.jetbrains.annotations
  */
 @MustBeDocumented
 @Retention(AnnotationRetention.BINARY)
-@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
 annotation class BlockingExecutor
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nls.kt b/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nls.kt
@@ -47,7 +47,6 @@ package org.jetbrains.annotations
     AnnotationTarget.LOCAL_VARIABLE,
     AnnotationTarget.CLASS,
     AnnotationTarget.TYPE,
-    AnnotationTarget.TYPE_PARAMETER,
     AnnotationTarget.FILE
 )
 annotation class Nls(val capitalization: Capitalization = Capitalization.NotSpecified) {

diff --git a/...atform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt b/...atform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt
@@ -64,5 +64,5 @@ package org.jetbrains.annotations
  */
 @MustBeDocumented
 @Retention(AnnotationRetention.BINARY)
-@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
 annotation class NonBlockingExecutor
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonNls.kt b/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonNls.kt
@@ -68,7 +68,6 @@ package org.jetbrains.annotations
     AnnotationTarget.LOCAL_VARIABLE,
     AnnotationTarget.CLASS,
     AnnotationTarget.TYPE,
-    AnnotationTarget.TYPE_PARAMETER,
     AnnotationTarget.FILE
 )
 annotation class NonNls
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nullable.kt b/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nullable.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/PropertyKey.kt b/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/PropertyKey.kt
@@ -28,9 +28,7 @@ package org.jetbrains.annotations
     AnnotationTarget.VALUE_PARAMETER,
     AnnotationTarget.LOCAL_VARIABLE,
     AnnotationTarget.FIELD,
-    AnnotationTarget.CLASS,
     AnnotationTarget.TYPE,
-    AnnotationTarget.TYPE_PARAMETER
 )
 annotation class PropertyKey(
     /**

diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Range.kt b/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Range.kt
@@ -29,7 +29,7 @@ package org.jetbrains.annotations
  */
 @MustBeDocumented
 @Retention(AnnotationRetention.BINARY)
-@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
+@Target(AnnotationTarget.TYPE)
 annotation class Range(
     /**
      * @return minimal allowed value (inclusive)

diff --git a/...latform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/UnknownNullability.kt b/...latform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/UnknownNullability.kt
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt b/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt
@@ -29,5 +29,5 @@ package org.jetbrains.annotations
  */
 @MustBeDocumented
 @Retention(AnnotationRetention.BINARY)
-@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
+@Target(AnnotationTarget.TYPE)
 annotation class Unmodifiable 
diff --git a/...iplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/UnmodifiableView.kt b/...iplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/UnmodifiableView.kt
diff --git a/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/JdkConstants.java b/multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/JdkConstants.java
diff --git a/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NotNull.java b/multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NotNull.java