[Gradle] Replace o.j.k.g.utils.UnsafeApi with o.j.k.tooling.core.UnsafeApi

This commit is contained in:
sebastian.sellmair
2022-05-23 10:57:25 +02:00
committed by Space
parent 865a91784b
commit 290fda9c10
8 changed files with 10 additions and 16 deletions
@@ -10,7 +10,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.FragmentGranularMetadataResolverFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
import org.jetbrains.kotlin.gradle.utils.UnsafeApi
import org.jetbrains.kotlin.tooling.core.UnsafeApi
@OptIn(UnsafeApi::class)
internal fun IdeaKotlinProjectModelBuilder.Companion.default(
@@ -12,7 +12,7 @@ import org.gradle.tooling.provider.model.ToolingModelBuilder
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKotlinProjectModelBuilder.*
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
import org.jetbrains.kotlin.gradle.utils.UnsafeApi
import org.jetbrains.kotlin.tooling.core.UnsafeApi
internal class IdeaKotlinProjectModelBuilderImpl @UnsafeApi("Use factory methods instead") constructor(
private val extension: KotlinPm20ProjectExtension,
@@ -10,7 +10,7 @@ import org.gradle.api.Task
import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.tasks.dependsOn
import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask
import org.jetbrains.kotlin.gradle.utils.UnsafeApi
import org.jetbrains.kotlin.tooling.core.UnsafeApi
@Idea222Api
internal fun Project.ideaImportDependsOn(task: TaskProvider<*>) {
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.associateWithClosure
import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropIdentifier.Scope
import org.jetbrains.kotlin.gradle.utils.UnsafeApi
import org.jetbrains.kotlin.tooling.core.UnsafeApi
internal class CInteropCommonizerDependent @UnsafeApi constructor(
val target: SharedCommonizerTarget,
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.gradle.targets.native.internal
import org.gradle.api.tasks.Input
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinCompilationData
import org.jetbrains.kotlin.gradle.utils.UnsafeApi
import org.jetbrains.kotlin.tooling.core.UnsafeApi
import java.io.Serializable
/**
@@ -1,10 +0,0 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.utils
@RequiresOptIn("Unsafe API. Please use safe counterpart", level = RequiresOptIn.Level.ERROR)
@Retention(AnnotationRetention.BINARY)
internal annotation class UnsafeApi(val message: String = "")
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.gradle.enableCInteropCommonization
import org.jetbrains.kotlin.gradle.plugin.ide.Idea222Api
import org.jetbrains.kotlin.gradle.plugin.ide.ideaImportDependsOn
import org.jetbrains.kotlin.gradle.plugin.ide.prepareKotlinIdeaImportTask
import org.jetbrains.kotlin.gradle.utils.UnsafeApi
import org.jetbrains.kotlin.tooling.core.UnsafeApi
import kotlin.test.Test
import kotlin.test.assertNotNull
import kotlin.test.assertNull
@@ -5,5 +5,9 @@
package org.jetbrains.kotlin.tooling.core
/**
* Generic Annotation to mark APIs as 'unsafe'.
* This annotation is intended for usage outside this module
*/
@RequiresOptIn(level = RequiresOptIn.Level.ERROR, message = "Use safe API counterpart")
annotation class UnsafeApi(val message: String = "")