diff --git a/compiler/testData/cli/jvm/compatqualDefault.args b/compiler/testData/cli/jvm/compatqualDefault.args index 497381767fa..c5d81cfe269 100644 --- a/compiler/testData/cli/jvm/compatqualDefault.args +++ b/compiler/testData/cli/jvm/compatqualDefault.args @@ -1,5 +1,6 @@ $TESTDATA_DIR$/compatqualUsage.kt $TESTDATA_DIR$/compatqual $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/compatqualDisable.args b/compiler/testData/cli/jvm/compatqualDisable.args index 980a43d36c3..5c24b3b1f77 100644 --- a/compiler/testData/cli/jvm/compatqualDisable.args +++ b/compiler/testData/cli/jvm/compatqualDisable.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/compatqualUsage.kt $TESTDATA_DIR$/compatqual $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/compatqualEnable.args b/compiler/testData/cli/jvm/compatqualEnable.args index 99dde6de749..6f8af541a5f 100644 --- a/compiler/testData/cli/jvm/compatqualEnable.args +++ b/compiler/testData/cli/jvm/compatqualEnable.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/compatqualUsage.kt $TESTDATA_DIR$/compatqual $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/compatqualWrong.args b/compiler/testData/cli/jvm/compatqualWrong.args index f05608f4664..771f04dae89 100644 --- a/compiler/testData/cli/jvm/compatqualWrong.args +++ b/compiler/testData/cli/jvm/compatqualWrong.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/compatqualUsage.kt $TESTDATA_DIR$/compatqual $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jspecifyByLv15.args b/compiler/testData/cli/jvm/jspecifyByLv15.args index 0339849b22c..e9c29bfe04b 100644 --- a/compiler/testData/cli/jvm/jspecifyByLv15.args +++ b/compiler/testData/cli/jvm/jspecifyByLv15.args @@ -3,5 +3,6 @@ $TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecify $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jspecifyByLv16.args b/compiler/testData/cli/jvm/jspecifyByLv16.args index 53e7fd977b8..b0de91984b6 100644 --- a/compiler/testData/cli/jvm/jspecifyByLv16.args +++ b/compiler/testData/cli/jvm/jspecifyByLv16.args @@ -3,5 +3,6 @@ $TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecify $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jspecifyDefault.args b/compiler/testData/cli/jvm/jspecifyDefault.args index 0664e0e7874..fb72ac3859f 100644 --- a/compiler/testData/cli/jvm/jspecifyDefault.args +++ b/compiler/testData/cli/jvm/jspecifyDefault.args @@ -1,5 +1,6 @@ $TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecify $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jspecifyIgnore.args b/compiler/testData/cli/jvm/jspecifyIgnore.args index 8f45dc80919..3252a4d7462 100644 --- a/compiler/testData/cli/jvm/jspecifyIgnore.args +++ b/compiler/testData/cli/jvm/jspecifyIgnore.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecify $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jspecifyStrict.args b/compiler/testData/cli/jvm/jspecifyStrict.args index 4ae71f84fa7..372a8a1ad19 100644 --- a/compiler/testData/cli/jvm/jspecifyStrict.args +++ b/compiler/testData/cli/jvm/jspecifyStrict.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecify $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jspecifyWarn.args b/compiler/testData/cli/jvm/jspecifyWarn.args index 4736cce9f0b..2eccf15ab5a 100644 --- a/compiler/testData/cli/jvm/jspecifyWarn.args +++ b/compiler/testData/cli/jvm/jspecifyWarn.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jspecifyUsage.kt $TESTDATA_DIR$/jspecify $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305AllIgnore.args b/compiler/testData/cli/jvm/jsr305AllIgnore.args index cf28143039d..e4228a066f1 100644 --- a/compiler/testData/cli/jvm/jsr305AllIgnore.args +++ b/compiler/testData/cli/jvm/jsr305AllIgnore.args @@ -3,5 +3,6 @@ $TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305DefaultMigration.args b/compiler/testData/cli/jvm/jsr305DefaultMigration.args index 7213fe2039e..7e0c7a60ae0 100644 --- a/compiler/testData/cli/jvm/jsr305DefaultMigration.args +++ b/compiler/testData/cli/jvm/jsr305DefaultMigration.args @@ -1,5 +1,6 @@ $TESTDATA_DIR$/jsr305DefaultMigration.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305DeprecatedEnable.args b/compiler/testData/cli/jvm/jsr305DeprecatedEnable.args index 3bdaf1df819..0f21ad071ed 100644 --- a/compiler/testData/cli/jvm/jsr305DeprecatedEnable.args +++ b/compiler/testData/cli/jvm/jsr305DeprecatedEnable.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305DeprecatedIgnore.args b/compiler/testData/cli/jvm/jsr305DeprecatedIgnore.args index 14968120f87..7c5a356499e 100644 --- a/compiler/testData/cli/jvm/jsr305DeprecatedIgnore.args +++ b/compiler/testData/cli/jvm/jsr305DeprecatedIgnore.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305DeprecatedWarn.args b/compiler/testData/cli/jvm/jsr305DeprecatedWarn.args index e32ccfe46bd..a0e0bbed9f9 100644 --- a/compiler/testData/cli/jvm/jsr305DeprecatedWarn.args +++ b/compiler/testData/cli/jvm/jsr305DeprecatedWarn.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305FqNameIgnore.args b/compiler/testData/cli/jvm/jsr305FqNameIgnore.args index cb9a33974a5..4e86e5ea210 100644 --- a/compiler/testData/cli/jvm/jsr305FqNameIgnore.args +++ b/compiler/testData/cli/jvm/jsr305FqNameIgnore.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d -$TEMP_DIR$ \ No newline at end of file +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305FqNameStrict.args b/compiler/testData/cli/jvm/jsr305FqNameStrict.args index b5fdb2c9c73..7c0532bba57 100644 --- a/compiler/testData/cli/jvm/jsr305FqNameStrict.args +++ b/compiler/testData/cli/jvm/jsr305FqNameStrict.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d -$TEMP_DIR$ \ No newline at end of file +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305Ignore.args b/compiler/testData/cli/jvm/jsr305Ignore.args index 967f733e07b..a6e45531394 100644 --- a/compiler/testData/cli/jvm/jsr305Ignore.args +++ b/compiler/testData/cli/jvm/jsr305Ignore.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305MigrationDefault.args b/compiler/testData/cli/jvm/jsr305MigrationDefault.args index 91172f4fb6b..00494b57c9e 100644 --- a/compiler/testData/cli/jvm/jsr305MigrationDefault.args +++ b/compiler/testData/cli/jvm/jsr305MigrationDefault.args @@ -1,5 +1,6 @@ $TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d -$TEMP_DIR$ \ No newline at end of file +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305MigrationFqNameIgnore.args b/compiler/testData/cli/jvm/jsr305MigrationFqNameIgnore.args index 534e27ecac3..a211f2b81f2 100644 --- a/compiler/testData/cli/jvm/jsr305MigrationFqNameIgnore.args +++ b/compiler/testData/cli/jvm/jsr305MigrationFqNameIgnore.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d -$TEMP_DIR$ \ No newline at end of file +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305MigrationIgnore.args b/compiler/testData/cli/jvm/jsr305MigrationIgnore.args index d251fb31748..b4a5e79b735 100644 --- a/compiler/testData/cli/jvm/jsr305MigrationIgnore.args +++ b/compiler/testData/cli/jvm/jsr305MigrationIgnore.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d -$TEMP_DIR$ \ No newline at end of file +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305MigrationWarn.args b/compiler/testData/cli/jvm/jsr305MigrationWarn.args index 1122378c274..c9c972bb8e2 100644 --- a/compiler/testData/cli/jvm/jsr305MigrationWarn.args +++ b/compiler/testData/cli/jvm/jsr305MigrationWarn.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Migration.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d -$TEMP_DIR$ \ No newline at end of file +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305NoFlag.args b/compiler/testData/cli/jvm/jsr305NoFlag.args index 9c80e2dc59c..72cae55cff6 100644 --- a/compiler/testData/cli/jvm/jsr305NoFlag.args +++ b/compiler/testData/cli/jvm/jsr305NoFlag.args @@ -1,5 +1,6 @@ $TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305Strict.args b/compiler/testData/cli/jvm/jsr305Strict.args index 3961f1f4cfe..469c0d24db8 100644 --- a/compiler/testData/cli/jvm/jsr305Strict.args +++ b/compiler/testData/cli/jvm/jsr305Strict.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/jsr305Warn.args b/compiler/testData/cli/jvm/jsr305Warn.args index bc5461dac12..857acbbce5f 100644 --- a/compiler/testData/cli/jvm/jsr305Warn.args +++ b/compiler/testData/cli/jvm/jsr305Warn.args @@ -2,5 +2,6 @@ $TESTDATA_DIR$/jsr305Usage.kt $TESTDATA_DIR$/jsr305 $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/nullabilityAnnotations.args b/compiler/testData/cli/jvm/nullabilityAnnotations.args index 114b3e66dfc..13fe69e2f09 100644 --- a/compiler/testData/cli/jvm/nullabilityAnnotations.args +++ b/compiler/testData/cli/jvm/nullabilityAnnotations.args @@ -5,5 +5,6 @@ $TESTDATA_DIR$/severalAnnotations.kt $TESTDATA_DIR$/jspecify $TESTDATA_DIR$/compatqual $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingArgs.args b/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingArgs.args index 19399754e4c..86d3fcc1112 100644 --- a/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingArgs.args +++ b/compiler/testData/cli/jvm/readingConfigFromEnvironment/overridingArgs.args @@ -1,6 +1,7 @@ $TESTDATA_DIR$/overridingArgs.kt $TESTDATA_DIR$/java $FOREIGN_ANNOTATIONS_DIR$ +$JSR_305_DECLARATIONS$ -d $TEMP_DIR$ --Xnullability-annotations=@org.jetbrains.annotations\:warn \ No newline at end of file +-Xnullability-annotations=@org.jetbrains.annotations\:warn diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/ThirdPartyAnnotationPaths.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/ThirdPartyAnnotationPaths.kt index 4a1129baf93..47ba303123d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/ThirdPartyAnnotationPaths.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/ThirdPartyAnnotationPaths.kt @@ -17,4 +17,5 @@ package org.jetbrains.kotlin.checkers const val FOREIGN_ANNOTATIONS_SOURCES_PATH = "third-party/annotations" +const val JSR_305_SOURCES_PATH = "third-party/jsr305" const val FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH = "third-party/java8-annotations" diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java index 67d22e9eab7..9a3a22cdc91 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java @@ -275,6 +275,10 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir { "$FOREIGN_ANNOTATIONS_DIR$", new File(ThirdPartyAnnotationPathsKt.FOREIGN_ANNOTATIONS_SOURCES_PATH).getPath() ) + .replace( + "$JSR_305_DECLARATIONS$", + new File(ThirdPartyAnnotationPathsKt.JSR_305_SOURCES_PATH).getPath() + ) .replace( "$FOREIGN_JAVA8_ANNOTATIONS_DIR$", new File(ThirdPartyAnnotationPathsKt.FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH).getPath()