Skip to content

Commit bf48b41

Browse files
authored
Merge pull request #107 from serjsysoev/remove-redundant
Remove annotation targets that were not there before, cleanup
2 parents 8dded6b + 31c2564 commit bf48b41

File tree

13 files changed

+4
-278
lines changed

13 files changed

+4
-278
lines changed

Diff for: multiplatform-annotations/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ kotlin {
7070
compilations.all {
7171
compilerOptions.configure {
7272
freeCompilerArgs.add("-XXLanguage:-EnumEntries")
73-
freeCompilerArgs.add("-Xexpect-actual-classes")
7473
}
7574
}
7675
}

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ package org.jetbrains.annotations
6464
*/
6565
@MustBeDocumented
6666
@Retention(AnnotationRetention.BINARY)
67-
@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
67+
@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
6868
annotation class BlockingExecutor

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nls.kt

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ package org.jetbrains.annotations
4747
AnnotationTarget.LOCAL_VARIABLE,
4848
AnnotationTarget.CLASS,
4949
AnnotationTarget.TYPE,
50-
AnnotationTarget.TYPE_PARAMETER,
5150
AnnotationTarget.FILE
5251
)
5352
annotation class Nls(val capitalization: Capitalization = Capitalization.NotSpecified) {

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ package org.jetbrains.annotations
6464
*/
6565
@MustBeDocumented
6666
@Retention(AnnotationRetention.BINARY)
67-
@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
67+
@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
6868
annotation class NonBlockingExecutor

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonNls.kt

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ package org.jetbrains.annotations
6868
AnnotationTarget.LOCAL_VARIABLE,
6969
AnnotationTarget.CLASS,
7070
AnnotationTarget.TYPE,
71-
AnnotationTarget.TYPE_PARAMETER,
7271
AnnotationTarget.FILE
7372
)
7473
annotation class NonNls

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nullable.kt

-55
This file was deleted.

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/PropertyKey.kt

-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ package org.jetbrains.annotations
2828
AnnotationTarget.VALUE_PARAMETER,
2929
AnnotationTarget.LOCAL_VARIABLE,
3030
AnnotationTarget.FIELD,
31-
AnnotationTarget.CLASS,
3231
AnnotationTarget.TYPE,
33-
AnnotationTarget.TYPE_PARAMETER
3432
)
3533
annotation class PropertyKey(
3634
/**

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Range.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ package org.jetbrains.annotations
2929
*/
3030
@MustBeDocumented
3131
@Retention(AnnotationRetention.BINARY)
32-
@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
32+
@Target(AnnotationTarget.TYPE)
3333
annotation class Range(
3434
/**
3535
* @return minimal allowed value (inclusive)

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/UnknownNullability.kt

-41
This file was deleted.

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ package org.jetbrains.annotations
2929
*/
3030
@MustBeDocumented
3131
@Retention(AnnotationRetention.BINARY)
32-
@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.TYPE_PARAMETER)
32+
@Target(AnnotationTarget.TYPE)
3333
annotation class Unmodifiable

Diff for: multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/UnmodifiableView.kt

-31
This file was deleted.

Diff for: multiplatform-annotations/src/jvmMain/java/org/intellij/lang/annotations/JdkConstants.java

-98
This file was deleted.

Diff for: multiplatform-annotations/src/jvmMain/java/org/jetbrains/annotations/NotNull.java

-44
This file was deleted.

0 commit comments

Comments
 (0)