From 42ceb796377943dd338c91c369e2ee7025106880 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Fri, 29 May 2020 23:59:15 +0200 Subject: [PATCH] Wrong module + put back ideaActive check before adding srcDirs --- .../build.gradle.kts | 27 +++++++++++++------ multiplatform-crypto/build.gradle.kts | 4 +-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/multiplatform-crypto-delegated/build.gradle.kts b/multiplatform-crypto-delegated/build.gradle.kts index 1420333..7443727 100644 --- a/multiplatform-crypto-delegated/build.gradle.kts +++ b/multiplatform-crypto-delegated/build.gradle.kts @@ -251,12 +251,16 @@ kotlin { } val linuxMain by getting { dependsOn(nativeMain) - kotlin.srcDir("src/nativeMain/kotlin") + if (ideaActive) { + kotlin.srcDir("src/nativeMain/kotlin") + } // } val linuxTest by getting { dependsOn(nativeTest) - kotlin.srcDir("src/nativeTest/kotlin") + if (ideaActive) { + kotlin.srcDir("src/nativeTest/kotlin") + } // } @@ -307,12 +311,16 @@ kotlin { val macosX64Main by getting { dependsOn(nativeMain) - kotlin.srcDir("src/nativeMain/kotlin") + if (ideaActive) { + kotlin.srcDir("src/nativeMain/kotlin") + } } val macosX64Test by getting { dependsOn(nativeTest) - kotlin.srcDir("src/nativeTest/kotlin") + if (ideaActive) { + kotlin.srcDir("src/nativeTest/kotlin") + } } } @@ -331,14 +339,17 @@ kotlin { // if (hostOsName == "windows") { val mingwX64Main by getting { - dependsOn(commonMain) - dependencies { - implementation(Deps.Native.coroutines) + dependsOn(nativeMain) + if (ideaActive) { + kotlin.srcDir("src/nativeMain/kotlin") } } val mingwX64Test by getting { - dependsOn(commonTest) + dependsOn(nativeTest) + if (ideaActive) { + kotlin.srcDir("src/nativeTest/kotlin") + } } } diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts index 875b74b..a19f896 100644 --- a/multiplatform-crypto/build.gradle.kts +++ b/multiplatform-crypto/build.gradle.kts @@ -306,13 +306,13 @@ kotlin { } val macosX64Main by getting { - dependsOn(nativeMain) + dependsOn(commonMain) if (ideaActive) { kotlin.srcDir("src/nativeMain/kotlin") } } val macosX64Test by getting { - dependsOn(nativeTest) + dependsOn(commonTest) if (ideaActive) { kotlin.srcDir("src/nativeTest/kotlin") }