|
|
@ -24,7 +24,6 @@ plugins {
|
|
|
|
|
|
|
|
|
|
|
|
kotlin {
|
|
|
|
kotlin {
|
|
|
|
jvm().withJava()
|
|
|
|
jvm().withJava()
|
|
|
|
js()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sourceSets {
|
|
|
|
sourceSets {
|
|
|
|
val commonMain by getting {
|
|
|
|
val commonMain by getting {
|
|
|
@ -66,28 +65,12 @@ kotlin {
|
|
|
|
implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
|
|
|
|
implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
val jsMain by getting {
|
|
|
|
|
|
|
|
dependencies {
|
|
|
|
|
|
|
|
implementation(kotlin("stdlib-js"))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
val jsTest by getting {
|
|
|
|
|
|
|
|
dependencies {
|
|
|
|
|
|
|
|
implementation(kotlin("test-js"))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
js {
|
|
|
|
|
|
|
|
browser()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tasks.named<ProcessResources>("jvmProcessResources") {
|
|
|
|
tasks.named<org.gradle.language.jvm.tasks.ProcessResources>("jvmProcessResources") {
|
|
|
|
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
|
|
|
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tasks.named<ProcessResources>(name = "jvmTestProcessResources") {
|
|
|
|
tasks.named<org.gradle.language.jvm.tasks.ProcessResources>("jvmTestProcessResources") {
|
|
|
|
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
|
|
|
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
|
|
|
}
|
|
|
|
}
|
|
|
|