Skip to content

Commit 50e758c

Browse files
committed
Remove the @Inclubating annotation from UnstableApiUsage inspection
Also remove `@Suppress("UnstableApiUsage)"` where it was relevant
1 parent ffd0b43 commit 50e758c

File tree

15 files changed

+19
-28
lines changed

15 files changed

+19
-28
lines changed

.idea/inspectionProfiles/idea_default.xml

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt

-3
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
186186
val getConfigurationName = dependencyHolderClass.getMethodOrNull(configurationNameAccessor) ?: return emptyList()
187187
val configurationName = getConfigurationName(dependencyHolder) as? String ?: return emptyList()
188188
val configuration = project.configurations.findByName(configurationName) ?: return emptyList()
189-
@Suppress("UnstableApiUsage")
190189
if (!configuration.isCanBeResolved) return emptyList()
191190

192191
val dependencyAdjuster =
@@ -512,7 +511,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
512511
return (getCompileClasspath(compileKotlinTask) as? Collection<File>)?.map { it.path } ?: emptyList()
513512
}
514513

515-
@Suppress("UnstableApiUsage")
516514
private fun buildCompilationOutput(
517515
gradleCompilation: Named,
518516
compileKotlinTask: Task
@@ -580,7 +578,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
580578
}
581579
}
582580

583-
@Suppress("UnstableApiUsage")
584581
private class DependencyAdjuster(
585582
private val configuration: Configuration,
586583
private val scope: String,

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt

-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ internal open class GradleCompilerRunner(protected val task: Task) {
196196
project.buildDir,
197197
taskData.buildHistoryFile
198198
)
199-
@Suppress("UnstableApiUsage")
200199
dirToModule[taskData.destinationDir.get()] = module
201200

202201
taskData.javaOutputDir?.let { dirToModule[it] = module }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt

-1
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,6 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
475475
val kaptTaskName = getKaptTaskName("kaptGenerateStubs")
476476

477477
KotlinCompileTaskData.register(kaptTaskName, KotlinCompileTaskData.get(project, kotlinCompile.name).compilation).apply {
478-
@Suppress("UnstableApiUsage")
479478
useModuleDetection.set(KotlinCompileTaskData.get(project, kotlinCompile.name).useModuleDetection)
480479
}
481480

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt

-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
8585
logger.kotlinDebug("Creating kotlin compile task $name")
8686

8787
KotlinCompileTaskData.register(name, kotlinCompilation).apply {
88-
@Suppress("UnstableApiUsage")
8988
destinationDir.set(project.provider { defaultKotlinDestinationDir })
9089
}
9190

@@ -920,7 +919,6 @@ abstract class AbstractAndroidProjectHandler<V>(private val kotlinConfigurationT
920919

921920
KotlinCompileTaskData.register(kotlinTaskName, compilation).apply {
922921
// store kotlin classes in separate directory. They will serve as class-path to java compiler
923-
@Suppress("UnstableApiUsage")
924922
destinationDir.set(project.provider { File(project.buildDir, "tmp/kotlin-classes/$variantDataName") })
925923
}
926924

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SourceSetVisibilityProvider.kt

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ internal class SourceSetVisibilityProvider(
3131
* If the [resolvedMppDependency] is a project dependency, its project should be passed as [resolvedToOtherProject], as
3232
* the Gradle API for dependency variants behaves differently for project dependencies and published ones.
3333
*/
34-
@Suppress("UnstableApiUsage")
3534
fun getVisibleSourceSetNames(
3635
visibleFrom: KotlinSourceSet,
3736
dependencyScopes: Iterable<KotlinDependencyScope>,

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt

-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ internal fun KotlinSourceSet.disambiguateName(simpleName: String): String {
217217

218218
private fun createDefaultSourceDirectorySet(project: Project, name: String?, resolver: FileResolver?): SourceDirectorySet {
219219
if (isGradleVersionAtLeast(5, 0)) {
220-
@Suppress("UnstableApiUsage")
221220
val objects = project.objects
222221
val sourceDirectorySetMethod = objects.javaClass.methods.single { it.name == "sourceDirectorySet" && it.parameterCount == 2 }
223222
return sourceDirectorySetMethod(objects, name, name) as SourceDirectorySet

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ open class KotlinPackageJsonTask : DefaultTask() {
6464
task.description = "Create package.json file for $compilation"
6565
task.group = NodeJsRootPlugin.TASKS_GROUP_NAME
6666

67-
@Suppress("UnstableApiUsage")
6867
task.dependsOn(target.project.provider { task.findDependentTasks() })
6968
task.mustRunAfter(rootClean)
7069
}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt

-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ class KotlinMetadataTargetConfigurator(kotlinPluginVersion: String) :
270270
* dependencies during the transformation. */
271271
private fun GranularMetadataTransformation.applyToConfiguration(configuration: Configuration) {
272272
// Run this action immediately before the configuration first takes part in dependency resolution:
273-
@Suppress("UnstableApiUsage")
274273
configuration.withDependencies {
275274
val (unrequested, requested) = metadataDependencyResolutions
276275
.partition { it is MetadataDependencyResolution.ExcludeAsUnrequested }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ abstract class KotlinTest : AbstractTestTask() {
2525
@Input
2626
var excludes = mutableSetOf<String>()
2727

28-
@Suppress("UnstableApiUsage")
2928
protected val filterExt: DefaultTestFilter
3029
@Internal get() = filter as DefaultTestFilter
3130

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt

+3-8
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
142142
private val taskData: KotlinCompileTaskData
143143
get() = KotlinCompileTaskData.get(project, name)
144144

145-
@Suppress("UnstableApiUsage")
146145
@get:Input
147146
internal open var useModuleDetection: Boolean
148147
get() = taskData.useModuleDetection.get()
@@ -185,21 +184,17 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
185184
get() = project.extensions.findByType(KotlinProjectExtension::class.java)!!
186185

187186
override fun getDestinationDir(): File =
188-
@Suppress("UnstableApiUsage")
189187
taskData.destinationDir.get()
190188

191-
@Suppress("UnstableApiUsage")
192189
override fun setDestinationDir(provider: Provider<File>) {
193190
taskData.destinationDir.set(provider)
194191
}
195192

196193
fun setDestinationDir(provider: () -> File) {
197-
@Suppress("UnstableApiUsage")
198194
taskData.destinationDir.set(project.provider(provider))
199195
}
200196

201197
override fun setDestinationDir(destinationDir: File) {
202-
@Suppress("UnstableApiUsage")
203198
taskData.destinationDir.set(destinationDir)
204199
}
205200

@@ -512,21 +507,21 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
512507

513508
@CacheableTask
514509
internal open class KotlinCompileWithWorkers @Inject constructor(
515-
@Suppress("UnstableApiUsage") private val workerExecutor: WorkerExecutor
510+
private val workerExecutor: WorkerExecutor
516511
) : KotlinCompile() {
517512
override fun compilerRunner() = GradleCompilerRunnerWithWorkers(this, workerExecutor)
518513
}
519514

520515
@CacheableTask
521516
internal open class Kotlin2JsCompileWithWorkers @Inject constructor(
522-
@Suppress("UnstableApiUsage") private val workerExecutor: WorkerExecutor
517+
private val workerExecutor: WorkerExecutor
523518
) : Kotlin2JsCompile() {
524519
override fun compilerRunner() = GradleCompilerRunnerWithWorkers(this, workerExecutor)
525520
}
526521

527522
@CacheableTask
528523
internal open class KotlinCompileCommonWithWorkers @Inject constructor(
529-
@Suppress("UnstableApiUsage") private val workerExecutor: WorkerExecutor
524+
private val workerExecutor: WorkerExecutor
530525
) : KotlinCompileCommon() {
531526
override fun compilerRunner() = GradleCompilerRunnerWithWorkers(this, workerExecutor)
532527
}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kotlinCompileTaskData.kt

-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import java.io.File
1414
internal open class KotlinCompileTaskData(
1515
val taskName: String,
1616
val compilation: AbstractKotlinCompilation<*>,
17-
@Suppress("UnstableApiUsage")
1817
val destinationDir: Property<File>,
19-
@Suppress("UnstableApiUsage")
2018
val useModuleDetection: Property<Boolean>
2119
) {
2220
private val taskBuildDirectory: File

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/KotlinTestReport.kt

-3
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ open class KotlinTestReport : TestReport() {
121121
}
122122

123123
private fun reportOn(task: AbstractTestTask) {
124-
@Suppress("UnstableApiUsage")
125124
reportOn(task.binResultsDir)
126125
}
127126

@@ -240,10 +239,8 @@ open class KotlinTestReport : TestReport() {
240239
task.ignoreRunFailures = true
241240
}
242241

243-
@Suppress("UnstableApiUsage")
244242
task.reports.html.isEnabled = false
245243

246-
@Suppress("UnstableApiUsage")
247244
task.reports.junitXml.isEnabled = false
248245
}
249246
}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinTest
1414
import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast
1515
import java.io.File
1616

17-
@Suppress("UnstableApiUsage")
1817
internal val Project.testResultsDir: File
1918
get() = project.buildDir.resolve(TestingBasePlugin.TEST_RESULTS_DIR_NAME)
2019
internal val Project.reportsDir: File
2120
get() = project.extensions.getByType(ReportingExtension::class.java).baseDir
22-
@Suppress("UnstableApiUsage")
21+
2322
internal val Project.testReportsDir: File
2423
get() = reportsDir.resolve(TestingBasePlugin.TESTS_DIR_NAME)
2524

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ internal fun AbstractArchiveTask.setArchiveAppendixCompatible(appendixProvider:
7373
internal val AbstractArchiveTask.archivePathCompatible: File
7474
get() =
7575
if (isGradleVersionAtLeast(5, 1)) {
76-
@Suppress("UnstableApiUsage")
7776
archiveFile.get().asFile
7877
} else {
7978
@Suppress("DEPRECATION")

0 commit comments

Comments
 (0)