diff --git a/multiplatform-crypto-delegated/build.gradle.kts b/multiplatform-crypto-delegated/build.gradle.kts index 1a99836..933f499 100644 --- a/multiplatform-crypto-delegated/build.gradle.kts +++ b/multiplatform-crypto-delegated/build.gradle.kts @@ -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) + } } } diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts index 67bb0fa..7b544c8 100644 --- a/multiplatform-crypto/build.gradle.kts +++ b/multiplatform-crypto/build.gradle.kts @@ -204,13 +204,15 @@ kotlin { targets.withType { 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 { diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 34149b4..d6f45dc 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -208,13 +208,15 @@ kotlin { targets.withType { 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 {