redo how prereleases are configured

This commit is contained in:
dfsek 2021-11-25 09:01:06 -07:00
parent 2018e3aa9f
commit 017a4f8e08
2 changed files with 11 additions and 2 deletions

View File

@ -4,11 +4,14 @@ import com.dfsek.terra.configureDistribution
import com.dfsek.terra.configurePublishing import com.dfsek.terra.configurePublishing
import com.dfsek.terra.version import com.dfsek.terra.version
import com.dfsek.terra.versionProjects import com.dfsek.terra.versionProjects
import com.dfsek.terra.preRelease
versionProjects(":common:api", version("6.0.0")) versionProjects(":common:api", version("6.0.0"))
versionProjects(":common:implementation", version("6.0.0")) versionProjects(":common:implementation", version("6.0.0"))
versionProjects(":platforms", version("6.0.0")) versionProjects(":platforms", version("6.0.0"))
preRelease(true)
allprojects { allprojects {
group = "com.dfsek.terra" group = "com.dfsek.terra"

View File

@ -2,14 +2,20 @@ package com.dfsek.terra
import org.gradle.api.Project import org.gradle.api.Project
var isPrerelease = false
fun preRelease(preRelease: Boolean) {
isPrerelease = preRelease
}
fun Project.versionProjects(project:String, version:String) { fun Project.versionProjects(project:String, version:String) {
project(project).subprojects.forEach { project(project).subprojects.forEach {
it.version = version it.version = version
} }
} }
fun Project.version(version: String, preRelease: Boolean = false): String { fun Project.version(version: String): String {
return if (!preRelease) return if (!isPrerelease)
version version
else //Only use git hash if it's a prerelease. else //Only use git hash if it's a prerelease.
"$version-BETA+${getGitHash()}" "$version-BETA+${getGitHash()}"