YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add temporary ios filtering everywhere

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-05-28 23:59:07 +02:00 committed by Ugljesa Jovanovic
parent 8b91cf41ea
commit 05ef422747
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
multiplatform-crypto-delegated/build.gradle.kts
View File

@ -203,8 +203,10 @@ kotlin {
}
compilations.getByName("test") {
println("Setting cinterop for $name")
defaultSourceSet.dependsOn(nativeTest)
if (this@withType.name.contains("ios").not()) {
println("Setting native test dep for $this@withType.name")
defaultSourceSet.dependsOn(nativeTest)
}
}
}

18
multiplatform-crypto/build.gradle.kts
View File

@ -204,13 +204,15 @@ kotlin {
targets.withType<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget> {
compilations.getByName("main") {
println("Setting native sourceset dependancy for $name")
if (!name.contains("ios")) {
if (this@withType.name.contains("ios").not()) {
println("Setting native sourceset dependancy for $this@withType.name")
defaultSourceSet.dependsOn(nativeMain)
}
}
compilations.getByName("test") {
println("Setting native sourceset dependancy for $name")
if (!name.contains("ios")) {
if (this@withType.name.contains("ios").not()) {
println("Setting native sourceset dependancy for $this@withType.name")
defaultSourceSet.dependsOn(nativeTest)
}
}
@ -283,24 +285,24 @@ kotlin {
if (hostOsName == "macos") {
val iosMain by getting {
dependsOn(nativeMain)
// dependsOn(nativeMain)
}
val iosTest by getting {
dependsOn(nativeTest)
// dependsOn(nativeTest)
}
val ios64ArmMain by getting {
dependsOn(nativeMain)
// dependsOn(nativeMain)
}
val ios64ArmTest by getting {
dependsOn(nativeTest)
// dependsOn(nativeTest)
}
val ios32ArmMain by getting {
dependsOn(nativeMain)
// dependsOn(nativeMain)
}
val ios32ArmTest by getting {
dependsOn(nativeTest)
// dependsOn(nativeTest)
}
val macosX64Main by getting {

18
sample/build.gradle.kts
View File

@ -208,13 +208,15 @@ kotlin {
targets.withType<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget> {
compilations.getByName("main") {
println("Setting native sourceset dependancy for $name")
if (!name.contains("ios")) {
if (this@withType.name.contains("ios").not()) {
println("Setting native sourceset deps for $this@withType.name")
defaultSourceSet.dependsOn(nativeMain)
}
}
compilations.getByName("test") {
println("Setting native sourceset dependancy for $name")
if (!name.contains("ios")) {
if (this@withType.name.contains("ios").not()) {
println("Setting native test deps for $this@withType.name")
defaultSourceSet.dependsOn(nativeTest)
}
}
@ -285,24 +287,24 @@ kotlin {
if (hostOsName == "macos") {
val iosMain by getting {
dependsOn(nativeMain)
// dependsOn(nativeMain)
}
val iosTest by getting {
dependsOn(nativeTest)
// dependsOn(nativeTest)
}
val ios64ArmMain by getting {
dependsOn(nativeMain)
// dependsOn(nativeMain)
}
val ios64ArmTest by getting {
dependsOn(nativeTest)
// dependsOn(nativeTest)
}
val ios32ArmMain by getting {
dependsOn(nativeMain)
// dependsOn(nativeMain)
}
val ios32ArmTest by getting {
dependsOn(nativeTest)
// dependsOn(nativeTest)
}
val macosX64Main by getting {