From 157adaffb7e62f289c92cd3de1e12e98211c35ea Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Wed, 14 Oct 2020 23:26:55 +0700 Subject: [PATCH] Configure kscience plugin publication --- build.gradle.kts | 23 +++++++++++------------ examples/build.gradle.kts | 7 ++++--- gradle.properties | 7 +++---- settings.gradle.kts | 3 +-- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fa678ac42..ce42deffb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,9 +5,9 @@ plugins { id("ru.mipt.npm.publish") apply false } -private val kmathVersion: String by extra("0.2.0-dev-2") -private val bintrayRepo: String by extra("kscience") -private val githubProject: String by extra("kmath") +internal val kmathVersion: String by extra("0.2.0-dev-2") +internal val bintrayRepo: String by extra("kscience") +internal val githubProject: String by extra("kmath") allprojects { repositories { @@ -22,15 +22,14 @@ allprojects { } subprojects { - if (name.startsWith("kmath")) apply() - - ksciencePublish { - spaceRepo = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven" - spaceUser = System.getenv("SPACE_USER") - spaceToken = System.getenv("SPACE_TOKEN") - } + if (!name.startsWith("kmath")) return@subprojects + apply() } -readme { - readmeTemplate = file("docs/templates/README-TEMPLATE.md") +ksciencePublish { + spaceRepo = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven" + spaceUser = System.getenv("SPACE_USER") + spaceToken = System.getenv("SPACE_TOKEN") } + +readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md") diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 900da966b..24c44aac4 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -10,10 +10,11 @@ plugins { allOpen.annotation("org.openjdk.jmh.annotations.State") repositories { - maven("https://dl.bintray.com/mipt-npm/kscience") + jcenter() + maven("https://dl.bintray.com/kotlin/kotlin-eap/") + maven("https://dl.bintray.com/kotlin/kotlinx") maven("https://dl.bintray.com/mipt-npm/dev") - maven("https://dl.bintray.com/kotlin/kotlin-dev/") - mavenCentral() + maven("https://dl.bintray.com/mipt-npm/kscience") } sourceSets.register("benchmarks") diff --git a/gradle.properties b/gradle.properties index 930bba550..88b90f27b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,8 @@ kotlin.code.style=official -kotlin.parallel.tasks.in.project=true kotlin.mpp.enableGranularSourceSetsMetadata=true -kotlin.native.enableDependencyPropagation=false kotlin.mpp.stability.nowarn=true - +kotlin.native.enableDependencyPropagation=false +kotlin.parallel.tasks.in.project=true org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m org.gradle.parallel=true -systemProp.org.gradle.internal.publish.checksums.insecure=true \ No newline at end of file +systemProp.org.gradle.internal.publish.checksums.insecure=true diff --git a/settings.gradle.kts b/settings.gradle.kts index 7ece3f25c..212ac5029 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,6 @@ pluginManagement { maven("https://dl.bintray.com/mipt-npm/kscience") maven("https://dl.bintray.com/mipt-npm/dev") maven("https://dl.bintray.com/kotlin/kotlinx") - maven("https://dl.bintray.com/kotlin/kotlin-dev/") } val toolsVersion = "0.6.1-dev-1.4.20-M1" @@ -25,11 +24,11 @@ pluginManagement { } rootProject.name = "kmath" + include( ":kmath-memory", ":kmath-core", ":kmath-functions", -// ":kmath-io", ":kmath-coroutines", ":kmath-histograms", ":kmath-commons",