From 757b609d2668b9834bef8d4e02d768913d09e3d5 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 7 Mar 2021 15:18:37 +0300 Subject: [PATCH] Publishing flag --- CHANGELOG.md | 1 + build.gradle.kts | 2 +- .../ru/mipt/npm/gradle/internal/publishing.kt | 22 ++++++++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d0852f..f232e80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- `publication.platform` changed to `publishing.platform` ### Deprecated diff --git a/build.gradle.kts b/build.gradle.kts index b645cc6..7f561df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.0" +version = "0.9.1" description = "Build tools for DataForge and kscience projects" diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt index cec6a2b..b4f9d05 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt @@ -98,7 +98,7 @@ internal fun Project.isSnapshot() = version.toString().contains("dev") || versio internal val Project.publicationTarget: String get() { - val publicationPlatform = project.findProperty("publication.platform") as? String + val publicationPlatform = project.findProperty("publishing.platform") as? String return if (publicationPlatform == null) { "AllPublications" } else { @@ -110,8 +110,12 @@ internal fun Project.addGithubPublishing( githubOrg: String, githubProject: String ) { + if (requestPropertyOrNull("publishing.enabled") != "true") { + logger.info("Skipping github publishing because publishing is disabled") + return + } if (requestPropertyOrNull("publishing.github") == "false") { - logger.info("Skipping github publishing based on flag value") + logger.info("Skipping github publishing because `publishing.github == false`") return } @@ -140,8 +144,12 @@ internal fun Project.addGithubPublishing( } internal fun Project.addSpacePublishing(spaceRepo: String) { + if (requestPropertyOrNull("publishing.enabled") != "true") { + logger.info("Skipping github publishing because publishing is disabled") + return + } if (requestPropertyOrNull("publishing.space") == "false") { - logger.info("Skipping space publishing based on flag value") + logger.info("Skipping space publishing because `publishing.space == false`") return } @@ -171,12 +179,16 @@ internal fun Project.addSpacePublishing(spaceRepo: String) { } internal fun Project.addSonatypePublishing() { - if(isSnapshot()){ + if(requestPropertyOrNull("publishing.enabled")!="true"){ + logger.info("Skipping github publishing because publishing is disabled") + return + } + if (isSnapshot()) { logger.info("Sonatype publishing skipped for dev version") return } if (requestPropertyOrNull("publishing.sonatype") == "false") { - logger.info("Skipping sonatype publishing based on flag value") + logger.info("Skipping sonatype publishing because `publishing.sonatype == false`") return }