From 017a4f8e08ee2c5c23719cedb187fcfb4268930a Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 25 Nov 2021 09:01:06 -0700 Subject: [PATCH] redo how prereleases are configured --- build.gradle.kts | 3 +++ .../src/main/kotlin/com/dfsek/terra/VersionConfig.kt | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index baaf853aa..78cd9d6a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,11 +4,14 @@ import com.dfsek.terra.configureDistribution import com.dfsek.terra.configurePublishing import com.dfsek.terra.version import com.dfsek.terra.versionProjects +import com.dfsek.terra.preRelease versionProjects(":common:api", version("6.0.0")) versionProjects(":common:implementation", version("6.0.0")) versionProjects(":platforms", version("6.0.0")) +preRelease(true) + allprojects { group = "com.dfsek.terra" diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt index 2c655243a..fe04ebb8b 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt @@ -2,14 +2,20 @@ package com.dfsek.terra import org.gradle.api.Project +var isPrerelease = false + +fun preRelease(preRelease: Boolean) { + isPrerelease = preRelease +} + fun Project.versionProjects(project:String, version:String) { project(project).subprojects.forEach { it.version = version } } -fun Project.version(version: String, preRelease: Boolean = false): String { - return if (!preRelease) +fun Project.version(version: String): String { + return if (!isPrerelease) version else //Only use git hash if it's a prerelease. "$version-BETA+${getGitHash()}"