diff --git a/build.gradle.kts b/build.gradle.kts index b794956a4..437f0030a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,8 +18,7 @@ buildscript { } plugins { - id("com.jfrog.artifactory") version "4.8.1" apply false -// id("org.jetbrains.kotlin.multiplatform") apply false + id("com.jfrog.artifactory") version "4.9.1" apply false } allprojects { @@ -29,7 +28,7 @@ allprojects { } group = "scientifik" - version = "0.0.3" + version = "0.0.3-dev" repositories { //maven("https://dl.bintray.com/kotlin/kotlin-eap") diff --git a/kmath-coroutines/build.gradle b/kmath-coroutines/build.gradle deleted file mode 100644 index 2c58a4112..000000000 --- a/kmath-coroutines/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -plugins { - id "org.jetbrains.kotlin.multiplatform" -} - -kotlin { - jvm() - js() - sourceSets { - commonMain { - dependencies { - api project(":kmath-core") - api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutinesVersion" - } - } - commonTest { - dependencies { - api 'org.jetbrains.kotlin:kotlin-test-common' - api 'org.jetbrains.kotlin:kotlin-test-annotations-common' - } - } - jvmMain { - dependencies { - api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - } - } - jvmTest { - dependencies { - implementation 'org.jetbrains.kotlin:kotlin-test' - implementation 'org.jetbrains.kotlin:kotlin-test-junit' - } - } - jsMain{ - dependencies{ - api "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion" - } - } -// mingwMain { -// } -// mingwTest { -// } - } -} diff --git a/kmath-coroutines/build.gradle.kts b/kmath-coroutines/build.gradle.kts new file mode 100644 index 000000000..c73d4e4dc --- /dev/null +++ b/kmath-coroutines/build.gradle.kts @@ -0,0 +1,46 @@ +plugins { + kotlin("multiplatform") +} + +val coroutinesVersion: String by rootProject.extra + +kotlin { + jvm() + js() + + sourceSets { + val commonMain by getting { + dependencies { + api(project(":kmath-core")) + api("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutinesVersion") + } + } + val commonTest by getting { + dependencies { + implementation(kotlin("test-common")) + implementation(kotlin("test-annotations-common")) + } + } + val jvmMain by getting { + dependencies { + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") + } + } + val jvmTest by getting { + dependencies { + implementation(kotlin("test")) + implementation(kotlin("test-junit")) + } + } + val jsMain by getting { + dependencies { + api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion") + } + } + val jsTest by getting { + dependencies { + implementation(kotlin("test-js")) + } + } + } +}