[Gradle][MPP] DEPRECATE_ERROR for deprecated targets in tests ^KT-58822
This commit is contained in:
committed by
Space Team
parent
1ef198ead4
commit
4ddc94bc8d
+2
@@ -15,6 +15,7 @@ kotlin {
|
|||||||
|
|
||||||
val iosX64 = iosX64()
|
val iosX64 = iosX64()
|
||||||
val iosArm64 = iosArm64()
|
val iosArm64 = iosArm64()
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
val iosArm32 = iosArm32()
|
val iosArm32 = iosArm32()
|
||||||
val iosSimulatorArm64 = iosSimulatorArm64()
|
val iosSimulatorArm64 = iosSimulatorArm64()
|
||||||
|
|
||||||
@@ -32,6 +33,7 @@ kotlin {
|
|||||||
watchosArm64(),
|
watchosArm64(),
|
||||||
watchosDeviceArm64(),
|
watchosDeviceArm64(),
|
||||||
watchosSimulatorArm64(),
|
watchosSimulatorArm64(),
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
watchosX86(),
|
watchosX86(),
|
||||||
watchosX64()
|
watchosX64()
|
||||||
).forEach { target ->
|
).forEach { target ->
|
||||||
|
|||||||
+1
@@ -19,6 +19,7 @@ publishing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
linuxArm32Hfp()
|
linuxArm32Hfp()
|
||||||
val targetsWithInterop = listOf(linuxX64(), linuxArm64())
|
val targetsWithInterop = listOf(linuxX64(), linuxArm64())
|
||||||
|
|
||||||
|
|||||||
+1
@@ -16,6 +16,7 @@ kotlin {
|
|||||||
linuxArm64()
|
linuxArm64()
|
||||||
|
|
||||||
if (properties.containsKey("p2.enableLinuxArm32Hfp")) {
|
if (properties.containsKey("p2.enableLinuxArm32Hfp")) {
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
linuxArm32Hfp()
|
linuxArm32Hfp()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
@@ -37,6 +37,7 @@ kotlin {
|
|||||||
ios()
|
ios()
|
||||||
|
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+1
@@ -29,6 +29,7 @@ kotlin {
|
|||||||
ios()
|
ios()
|
||||||
|
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+1
@@ -24,6 +24,7 @@ kotlin {
|
|||||||
linuxX64()
|
linuxX64()
|
||||||
ios()
|
ios()
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+5
@@ -19,7 +19,9 @@ kotlin {
|
|||||||
linuxArm64()
|
linuxArm64()
|
||||||
|
|
||||||
// Linux-specific targets – embedded:
|
// Linux-specific targets – embedded:
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
linuxMips32()
|
linuxMips32()
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
linuxMipsel32()
|
linuxMipsel32()
|
||||||
|
|
||||||
// macOS-specific targets - created by the ios() shortcut:
|
// macOS-specific targets - created by the ios() shortcut:
|
||||||
@@ -27,6 +29,7 @@ kotlin {
|
|||||||
|
|
||||||
// Windows-specific targets:
|
// Windows-specific targets:
|
||||||
mingwX64()
|
mingwX64()
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86()
|
mingwX86()
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
@@ -67,6 +70,7 @@ kotlin {
|
|||||||
dependsOn(commonMain)
|
dependsOn(commonMain)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
configure(listOf(linuxMips32(), linuxMipsel32())) {
|
configure(listOf(linuxMips32(), linuxMipsel32())) {
|
||||||
compilations["main"].defaultSourceSet.dependsOn(embeddedMain)
|
compilations["main"].defaultSourceSet.dependsOn(embeddedMain)
|
||||||
}
|
}
|
||||||
@@ -75,6 +79,7 @@ kotlin {
|
|||||||
dependsOn(commonMain)
|
dependsOn(commonMain)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
configure(listOf(mingwX64(), mingwX86())) {
|
configure(listOf(mingwX64(), mingwX86())) {
|
||||||
compilations["main"].defaultSourceSet.dependsOn(windowsMain)
|
compilations["main"].defaultSourceSet.dependsOn(windowsMain)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -10,5 +10,6 @@ kotlin {
|
|||||||
linuxX64()
|
linuxX64()
|
||||||
macosX64()
|
macosX64()
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -10,6 +10,7 @@ kotlin {
|
|||||||
linuxX64()
|
linuxX64()
|
||||||
macosX64()
|
macosX64()
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
targets.withType<KotlinNativeTarget>().forEach { target ->
|
targets.withType<KotlinNativeTarget>().forEach { target ->
|
||||||
|
|||||||
+1
@@ -11,6 +11,7 @@ kotlin {
|
|||||||
linuxX64()
|
linuxX64()
|
||||||
macosX64()
|
macosX64()
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+1
@@ -22,6 +22,7 @@ repositories {
|
|||||||
kotlin {
|
kotlin {
|
||||||
linuxX64()
|
linuxX64()
|
||||||
linuxArm64()
|
linuxArm64()
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
linuxArm32Hfp()
|
linuxArm32Hfp()
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+1
@@ -37,6 +37,7 @@ kotlin {
|
|||||||
iosSimulatorArm64()
|
iosSimulatorArm64()
|
||||||
|
|
||||||
mingwX64()
|
mingwX64()
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86()
|
mingwX86()
|
||||||
|
|
||||||
sourceSets.all {
|
sourceSets.all {
|
||||||
|
|||||||
+1
@@ -25,6 +25,7 @@ kotlin {
|
|||||||
ios()
|
ios()
|
||||||
|
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+1
@@ -25,6 +25,7 @@ kotlin {
|
|||||||
ios()
|
ios()
|
||||||
|
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+1
@@ -25,6 +25,7 @@ kotlin {
|
|||||||
ios()
|
ios()
|
||||||
|
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+1
@@ -31,6 +31,7 @@ kotlin {
|
|||||||
ios()
|
ios()
|
||||||
|
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+2
@@ -4,10 +4,12 @@ plugins {
|
|||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
iosX64()
|
iosX64()
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
iosArm32()
|
iosArm32()
|
||||||
linuxX64()
|
linuxX64()
|
||||||
linuxArm64()
|
linuxArm64()
|
||||||
mingwX64("windowsX64")
|
mingwX64("windowsX64")
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
mingwX86("windowsX86")
|
mingwX86("windowsX86")
|
||||||
|
|
||||||
val commonMain by sourceSets.getting
|
val commonMain by sourceSets.getting
|
||||||
|
|||||||
+1
@@ -15,6 +15,7 @@ kotlin {
|
|||||||
implementation(kotlin("stdlib-common"))
|
implementation(kotlin("stdlib-common"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
iosArm32()
|
iosArm32()
|
||||||
iosArm64()
|
iosArm64()
|
||||||
iosX64()
|
iosX64()
|
||||||
|
|||||||
+1
@@ -8,6 +8,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
@Suppress("DEPRECATION_ERROR")
|
||||||
linuxArm32Hfp("intPlatform") {
|
linuxArm32Hfp("intPlatform") {
|
||||||
compilations.get("main").cinterops.create("intPropertyInterop") {
|
compilations.get("main").cinterops.create("intPropertyInterop") {
|
||||||
header(file("libs/intPlatform.h"))
|
header(file("libs/intPlatform.h"))
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@ class KotlinTargetHierarchyDslTest {
|
|||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Suppress("DEPRECATION") // deprecated K/N targets
|
@Suppress("DEPRECATION_ERROR") // deprecated K/N targets
|
||||||
fun `test - hierarchy default - targets from all families`() {
|
fun `test - hierarchy default - targets from all families`() {
|
||||||
kotlin.apply {
|
kotlin.apply {
|
||||||
targetHierarchy.default()
|
targetHierarchy.default()
|
||||||
|
|||||||
Reference in New Issue
Block a user