azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] temporarily change error to warning for linuxArm32Hfp

Browse Source 
^KT-58864
This commit is contained in:
Svyatoslav Scherbina
2023-07-24 12:09:06 +02:00
committed by Space Team
parent be9d2953b2
commit 61dbe7fb75
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/presetEntries.kt
+1 -1
View File
@@ -113,7 +113,7 @@ internal val nativePresetEntries = HostManager().targets
val deprecation = KotlinPresetEntry.Deprecation( val deprecation = KotlinPresetEntry.Deprecation(
message = "DEPRECATED_TARGET_MESSAGE", message = "DEPRECATED_TARGET_MESSAGE",
level = DeprecationLevel.ERROR level = if (target in KonanTarget.toleratedDeprecatedTargets) DeprecationLevel.WARNING else DeprecationLevel.ERROR
).takeIf { target in KonanTarget.deprecatedTargets } ).takeIf { target in KonanTarget.deprecatedTargets }
KotlinPresetEntry(target.presetName, typeName(presetType), typeName(targetType), deprecation) KotlinPresetEntry(target.presetName, typeName(presetType), typeName(targetType), deprecation)
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions.kt
+9 -9
View File
@@ -475,7 +475,7 @@ interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithP
fun linuxArm64(configure: Action<KotlinNativeTarget>) = linuxArm64 { configure.execute(this) } fun linuxArm64(configure: Action<KotlinNativeTarget>) = linuxArm64 { configure.execute(this) }
@Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.ERROR) @Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.WARNING)
fun linuxArm32Hfp( fun linuxArm32Hfp(
name: String = "linuxArm32Hfp", name: String = "linuxArm32Hfp",
configure: KotlinNativeTarget.() -> Unit = { } configure: KotlinNativeTarget.() -> Unit = { }
@@ -487,20 +487,20 @@ interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithP
) )
@Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.ERROR) @Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.WARNING)
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION")
fun linuxArm32Hfp() = linuxArm32Hfp("linuxArm32Hfp") { } fun linuxArm32Hfp() = linuxArm32Hfp("linuxArm32Hfp") { }
@Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.ERROR) @Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.WARNING)
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION")
fun linuxArm32Hfp(name: String) = linuxArm32Hfp(name) { } fun linuxArm32Hfp(name: String) = linuxArm32Hfp(name) { }
@Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.ERROR) @Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.WARNING)
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION")
fun linuxArm32Hfp(name: String, configure: Action<KotlinNativeTarget>) = linuxArm32Hfp(name) { configure.execute(this) } fun linuxArm32Hfp(name: String, configure: Action<KotlinNativeTarget>) = linuxArm32Hfp(name) { configure.execute(this) }
@Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.ERROR) @Deprecated(DEPRECATED_TARGET_MESSAGE, level = DeprecationLevel.WARNING)
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION")
fun linuxArm32Hfp(configure: Action<KotlinNativeTarget>) = linuxArm32Hfp { configure.execute(this) } fun linuxArm32Hfp(configure: Action<KotlinNativeTarget>) = linuxArm32Hfp { configure.execute(this) }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/checkers/DeprecatedKotlinNativeTargetsChecker.kt
+2 -1
View File
@@ -16,7 +16,8 @@ internal object DeprecatedKotlinNativeTargetsChecker : KotlinGradleProjectChecke
override suspend fun KotlinGradleProjectCheckerContext.runChecks(collector: KotlinToolingDiagnosticsCollector) { override suspend fun KotlinGradleProjectCheckerContext.runChecks(collector: KotlinToolingDiagnosticsCollector) {
val targets = multiplatformExtension?.awaitTargets() ?: return val targets = multiplatformExtension?.awaitTargets() ?: return
val usedDeprecatedTargets = targets val usedDeprecatedTargets = targets
.filter { it is KotlinNativeTarget && it.konanTarget in KonanTarget.deprecatedTargets } .filterIsInstance<KotlinNativeTarget>()
.filter { it.konanTarget in KonanTarget.deprecatedTargets && it.konanTarget !in KonanTarget.toleratedDeprecatedTargets }
.map { it.name } .map { it.name }
if (usedDeprecatedTargets.isEmpty()) return if (usedDeprecatedTargets.isEmpty()) return
native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
+1
View File
@@ -67,5 +67,6 @@ sealed class KonanTarget(override val name: String, val family: Family, val arch
} }
val deprecatedTargets = setOf(WATCHOS_X86, IOS_ARM32, LINUX_ARM32_HFP, MINGW_X86, LINUX_MIPS32, LINUX_MIPSEL32, WASM32) val deprecatedTargets = setOf(WATCHOS_X86, IOS_ARM32, LINUX_ARM32_HFP, MINGW_X86, LINUX_MIPS32, LINUX_MIPSEL32, WASM32)
val toleratedDeprecatedTargets = setOf(LINUX_ARM32_HFP)
} }
} }