Wrong module + put back ideaActive check before adding srcDirs

This commit is contained in:
Ugljesa Jovanovic 2020-05-29 23:59:15 +02:00 committed by Ugljesa Jovanovic
parent 013682166c
commit 42ceb79637
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
2 changed files with 21 additions and 10 deletions

View File

@ -251,12 +251,16 @@ kotlin {
} }
val linuxMain by getting { val linuxMain by getting {
dependsOn(nativeMain) dependsOn(nativeMain)
kotlin.srcDir("src/nativeMain/kotlin") if (ideaActive) {
kotlin.srcDir("src/nativeMain/kotlin")
}
// //
} }
val linuxTest by getting { val linuxTest by getting {
dependsOn(nativeTest) dependsOn(nativeTest)
kotlin.srcDir("src/nativeTest/kotlin") if (ideaActive) {
kotlin.srcDir("src/nativeTest/kotlin")
}
// //
} }
@ -307,12 +311,16 @@ kotlin {
val macosX64Main by getting { val macosX64Main by getting {
dependsOn(nativeMain) dependsOn(nativeMain)
kotlin.srcDir("src/nativeMain/kotlin") if (ideaActive) {
kotlin.srcDir("src/nativeMain/kotlin")
}
} }
val macosX64Test by getting { val macosX64Test by getting {
dependsOn(nativeTest) dependsOn(nativeTest)
kotlin.srcDir("src/nativeTest/kotlin") if (ideaActive) {
kotlin.srcDir("src/nativeTest/kotlin")
}
} }
} }
@ -331,14 +339,17 @@ kotlin {
// //
if (hostOsName == "windows") { if (hostOsName == "windows") {
val mingwX64Main by getting { val mingwX64Main by getting {
dependsOn(commonMain) dependsOn(nativeMain)
dependencies { if (ideaActive) {
implementation(Deps.Native.coroutines) kotlin.srcDir("src/nativeMain/kotlin")
} }
} }
val mingwX64Test by getting { val mingwX64Test by getting {
dependsOn(commonTest) dependsOn(nativeTest)
if (ideaActive) {
kotlin.srcDir("src/nativeTest/kotlin")
}
} }
} }

View File

@ -306,13 +306,13 @@ kotlin {
} }
val macosX64Main by getting { val macosX64Main by getting {
dependsOn(nativeMain) dependsOn(commonMain)
if (ideaActive) { if (ideaActive) {
kotlin.srcDir("src/nativeMain/kotlin") kotlin.srcDir("src/nativeMain/kotlin")
} }
} }
val macosX64Test by getting { val macosX64Test by getting {
dependsOn(nativeTest) dependsOn(commonTest)
if (ideaActive) { if (ideaActive) {
kotlin.srcDir("src/nativeTest/kotlin") kotlin.srcDir("src/nativeTest/kotlin")
} }