diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml index d8ae91bd49a..bc918db8c27 100644 --- a/.idea/inspectionProfiles/idea_default.xml +++ b/.idea/inspectionProfiles/idea_default.xml @@ -436,6 +436,21 @@ + + + diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt index e6b5582ea56..f0d6858d1db 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt @@ -186,7 +186,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { val getConfigurationName = dependencyHolderClass.getMethodOrNull(configurationNameAccessor) ?: return emptyList() val configurationName = getConfigurationName(dependencyHolder) as? String ?: return emptyList() val configuration = project.configurations.findByName(configurationName) ?: return emptyList() - @Suppress("UnstableApiUsage") if (!configuration.isCanBeResolved) return emptyList() val dependencyAdjuster = @@ -512,7 +511,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { return (getCompileClasspath(compileKotlinTask) as? Collection)?.map { it.path } ?: emptyList() } - @Suppress("UnstableApiUsage") private fun buildCompilationOutput( gradleCompilation: Named, compileKotlinTask: Task @@ -580,7 +578,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { } } - @Suppress("UnstableApiUsage") private class DependencyAdjuster( private val configuration: Configuration, private val scope: String, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index 03b4aa68a9a..c907f25c7be 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -196,7 +196,6 @@ internal open class GradleCompilerRunner(protected val task: Task) { project.buildDir, taskData.buildHistoryFile ) - @Suppress("UnstableApiUsage") dirToModule[taskData.destinationDir.get()] = module taskData.javaOutputDir?.let { dirToModule[it] = module } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt index d6289febebb..d2f6cfb1ca5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt @@ -475,7 +475,6 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin { val kaptTaskName = getKaptTaskName("kaptGenerateStubs") KotlinCompileTaskData.register(kaptTaskName, KotlinCompileTaskData.get(project, kotlinCompile.name).compilation).apply { - @Suppress("UnstableApiUsage") useModuleDetection.set(KotlinCompileTaskData.get(project, kotlinCompile.name).useModuleDetection) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index da2bff9b508..884d707988c 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -85,7 +85,6 @@ internal abstract class KotlinSourceSetProcessor>( logger.kotlinDebug("Creating kotlin compile task $name") KotlinCompileTaskData.register(name, kotlinCompilation).apply { - @Suppress("UnstableApiUsage") destinationDir.set(project.provider { defaultKotlinDestinationDir }) } @@ -920,7 +919,6 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationT KotlinCompileTaskData.register(kotlinTaskName, compilation).apply { // store kotlin classes in separate directory. They will serve as class-path to java compiler - @Suppress("UnstableApiUsage") destinationDir.set(project.provider { File(project.buildDir, "tmp/kotlin-classes/$variantDataName") }) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt index 517edc13728..deff43a9ac9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt @@ -31,7 +31,6 @@ internal class SourceSetVisibilityProvider( * If the [resolvedMppDependency] is a project dependency, its project should be passed as [resolvedToOtherProject], as * the Gradle API for dependency variants behaves differently for project dependencies and published ones. */ - @Suppress("UnstableApiUsage") fun getVisibleSourceSetNames( visibleFrom: KotlinSourceSet, dependencyScopes: Iterable, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt index 8020b8b7622..b18c6a46380 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt @@ -217,7 +217,6 @@ internal fun KotlinSourceSet.disambiguateName(simpleName: String): String { private fun createDefaultSourceDirectorySet(project: Project, name: String?, resolver: FileResolver?): SourceDirectorySet { if (isGradleVersionAtLeast(5, 0)) { - @Suppress("UnstableApiUsage") val objects = project.objects val sourceDirectorySetMethod = objects.javaClass.methods.single { it.name == "sourceDirectorySet" && it.parameterCount == 2 } return sourceDirectorySetMethod(objects, name, name) as SourceDirectorySet diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt index be55299d824..79b8f34e5ff 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt @@ -64,7 +64,6 @@ open class KotlinPackageJsonTask : DefaultTask() { task.description = "Create package.json file for $compilation" task.group = NodeJsRootPlugin.TASKS_GROUP_NAME - @Suppress("UnstableApiUsage") task.dependsOn(target.project.provider { task.findDependentTasks() }) task.mustRunAfter(rootClean) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt index 08b0e35a321..2b09dd094ed 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt @@ -270,7 +270,6 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) : * dependencies during the transformation. */ private fun GranularMetadataTransformation.applyToConfiguration(configuration: Configuration) { // Run this action immediately before the configuration first takes part in dependency resolution: - @Suppress("UnstableApiUsage") configuration.withDependencies { val (unrequested, requested) = metadataDependencyResolutions .partition { it is MetadataDependencyResolution.ExcludeAsUnrequested } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt index 70c784b2ca9..831cb116655 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt @@ -25,7 +25,6 @@ abstract class KotlinTest : AbstractTestTask() { @Input var excludes = mutableSetOf() - @Suppress("UnstableApiUsage") protected val filterExt: DefaultTestFilter @Internal get() = filter as DefaultTestFilter diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 7334201a654..12f850658e5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -142,7 +142,6 @@ abstract class AbstractKotlinCompile() : AbstractKo private val taskData: KotlinCompileTaskData get() = KotlinCompileTaskData.get(project, name) - @Suppress("UnstableApiUsage") @get:Input internal open var useModuleDetection: Boolean get() = taskData.useModuleDetection.get() @@ -185,21 +184,17 @@ abstract class AbstractKotlinCompile() : AbstractKo get() = project.extensions.findByType(KotlinProjectExtension::class.java)!! override fun getDestinationDir(): File = - @Suppress("UnstableApiUsage") taskData.destinationDir.get() - @Suppress("UnstableApiUsage") override fun setDestinationDir(provider: Provider) { taskData.destinationDir.set(provider) } fun setDestinationDir(provider: () -> File) { - @Suppress("UnstableApiUsage") taskData.destinationDir.set(project.provider(provider)) } override fun setDestinationDir(destinationDir: File) { - @Suppress("UnstableApiUsage") taskData.destinationDir.set(destinationDir) } @@ -512,21 +507,21 @@ open class KotlinCompile : AbstractKotlinCompile(), Kotl @CacheableTask internal open class KotlinCompileWithWorkers @Inject constructor( - @Suppress("UnstableApiUsage") private val workerExecutor: WorkerExecutor + private val workerExecutor: WorkerExecutor ) : KotlinCompile() { override fun compilerRunner() = GradleCompilerRunnerWithWorkers(this, workerExecutor) } @CacheableTask internal open class Kotlin2JsCompileWithWorkers @Inject constructor( - @Suppress("UnstableApiUsage") private val workerExecutor: WorkerExecutor + private val workerExecutor: WorkerExecutor ) : Kotlin2JsCompile() { override fun compilerRunner() = GradleCompilerRunnerWithWorkers(this, workerExecutor) } @CacheableTask internal open class KotlinCompileCommonWithWorkers @Inject constructor( - @Suppress("UnstableApiUsage") private val workerExecutor: WorkerExecutor + private val workerExecutor: WorkerExecutor ) : KotlinCompileCommon() { override fun compilerRunner() = GradleCompilerRunnerWithWorkers(this, workerExecutor) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt index c93a1224da0..e79478ed4d2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt @@ -14,9 +14,7 @@ import java.io.File internal open class KotlinCompileTaskData( val taskName: String, val compilation: AbstractKotlinCompilation<*>, - @Suppress("UnstableApiUsage") val destinationDir: Property, - @Suppress("UnstableApiUsage") val useModuleDetection: Property ) { private val taskBuildDirectory: File diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestReport.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestReport.kt index 89405ad86fa..098131e59b7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestReport.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestReport.kt @@ -121,7 +121,6 @@ open class KotlinTestReport : TestReport() { } private fun reportOn(task: AbstractTestTask) { - @Suppress("UnstableApiUsage") reportOn(task.binResultsDir) } @@ -240,10 +239,8 @@ open class KotlinTestReport : TestReport() { task.ignoreRunFailures = true } - @Suppress("UnstableApiUsage") task.reports.html.isEnabled = false - @Suppress("UnstableApiUsage") task.reports.junitXml.isEnabled = false } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt index c42083d8779..1a6a5c88ce1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt @@ -14,12 +14,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinTest import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast import java.io.File -@Suppress("UnstableApiUsage") internal val Project.testResultsDir: File get() = project.buildDir.resolve(TestingBasePlugin.TEST_RESULTS_DIR_NAME) internal val Project.reportsDir: File get() = project.extensions.getByType(ReportingExtension::class.java).baseDir -@Suppress("UnstableApiUsage") + internal val Project.testReportsDir: File get() = reportsDir.resolve(TestingBasePlugin.TESTS_DIR_NAME) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt index bd84fd65004..c2051741b6d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt @@ -73,7 +73,6 @@ internal fun AbstractArchiveTask.setArchiveAppendixCompatible(appendixProvider: internal val AbstractArchiveTask.archivePathCompatible: File get() = if (isGradleVersionAtLeast(5, 1)) { - @Suppress("UnstableApiUsage") archiveFile.get().asFile } else { @Suppress("DEPRECATION")