From 414475f9f87a9bc49b0a27f8cc4c690d6910a13e Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Fri, 25 Mar 2022 19:07:53 +0300 Subject: Minor refactoring of dokka versioning and publishing (#2401) * Minor refactoring of dokka versioning and publishing * Added RC version type * Added gradle-plugin-portal as a publication channel * Removed `dokka_version_base` in favour of `dokka_version` * Change dokka_version to the relevant SNAPSHOT * Revert explicit flag for version checking, it will be executed automatically if publication channels are present * Update publish to GH pages script to include SNAPSHOT docs --- .../src/main/kotlin/org/jetbrains/DokkaVersion.kt | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt') diff --git a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt b/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt index 05585d06..517c7731 100644 --- a/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt +++ b/buildSrc/src/main/kotlin/org/jetbrains/DokkaVersion.kt @@ -4,26 +4,16 @@ import org.gradle.api.Project import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.provideDelegate +@Suppress("LocalVariableName") // property name with underscore as taken from gradle.properties fun Project.configureDokkaVersion(): String { - var dokka_version: String? by this.extra - if (dokka_version == null) { - val dokka_version_base: String by this - dokka_version = dokkaVersionFromBase(dokka_version_base) - } + val dokka_version: String? by this.extra return checkNotNull(dokka_version) } -private fun dokkaVersionFromBase(baseVersion: String): String { - val buildNumber = System.getenv("BUILD_NUMBER") - val forceSnapshot = System.getenv("FORCE_SNAPSHOT") != null - if (forceSnapshot || buildNumber == null) { - return "$baseVersion-SNAPSHOT" - } - return "$baseVersion-$buildNumber" -} - val Project.dokkaVersion: String get() = configureDokkaVersion() val Project.dokkaVersionType: DokkaVersionType? - get() = DokkaVersionType.values().find { it.suffix.matches(dokkaVersion.substringAfter("-", "")) } + get() = DokkaVersionType.values().find { + it.suffix.matches(dokkaVersion.substringAfter("-", "")) + } -- cgit