Migrates to collections 1.6, which deprecates iOS Intel targets.
This commit is contained in:
+2
-17
@@ -83,12 +83,11 @@ kotlin {
|
||||
|
||||
listOf(
|
||||
iosArm64(),
|
||||
iosX64(),
|
||||
iosSimulatorArm64(),
|
||||
).forEach { target ->
|
||||
|
||||
target.compilations.getByName("main") {
|
||||
val Clibsodium by cinterops.creating {
|
||||
val clibsodium by cinterops.creating {
|
||||
definitionFile = libsodiumDefFile
|
||||
packageName = "Clibsodium"
|
||||
|
||||
@@ -99,7 +98,7 @@ kotlin {
|
||||
)
|
||||
}
|
||||
|
||||
tasks.named(cinterops.getByName("Clibsodium").interopProcessingTaskName).configure {
|
||||
tasks.named(cinterops.getByName("clibsodium").interopProcessingTaskName).configure {
|
||||
dependsOn(libsodiumDefFileGeneration)
|
||||
}
|
||||
}
|
||||
@@ -120,12 +119,6 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
iosX64 {
|
||||
binaries.framework {
|
||||
baseName = xcfName
|
||||
}
|
||||
}
|
||||
|
||||
iosArm64 {
|
||||
binaries.framework {
|
||||
baseName = xcfName
|
||||
@@ -281,10 +274,6 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
val iosX64Main by getting {
|
||||
dependsOn(iosMain.get())
|
||||
}
|
||||
|
||||
val iosArm64Main by getting {
|
||||
dependsOn(iosMain.get())
|
||||
}
|
||||
@@ -299,10 +288,6 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
val iosX64Test by getting {
|
||||
dependsOn(iosTest.get())
|
||||
}
|
||||
|
||||
val iosArm64Test by getting {
|
||||
dependsOn(iosTest.get())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user