From 0001c20eea7c7a8eb7b1733b388071e29fb56497 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 24 Nov 2021 20:20:55 -0700 Subject: [PATCH] redo how versioning works --- build.gradle.kts | 7 +++++-- .../main/kotlin/com/dfsek/terra/CommonConfig.kt | 8 -------- .../main/kotlin/com/dfsek/terra/VersionConfig.kt | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt diff --git a/build.gradle.kts b/build.gradle.kts index f45d31c02..e38467373 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,11 +3,14 @@ import com.dfsek.terra.configureDependencies import com.dfsek.terra.configureDistribution import com.dfsek.terra.configurePublishing import com.dfsek.terra.version +import com.dfsek.terra.versionProjects + +versionProjects(":common:api", version("0.6.0")) +versionProjects(":common:implementation", version("0.6.0")) +versionProjects(":platforms", version("0.6.0")) -val versionObj = version("6", "0", "0", true) allprojects { - version = versionObj group = "com.dfsek.terra" configureDependencies() diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt index 0094c2a43..5fe68f42d 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt @@ -19,11 +19,3 @@ fun Project.gitClone(name: String) { standardOutput = stdout } } - -fun Project.version(major: String, minor: String, revision: String, preRelease: Boolean = false): String { - return if (!preRelease) - "$major.$minor.$revision" - else //Only use git hash if it's a prerelease. - "$major.$minor.$revision-BETA+${getGitHash()}" -} - diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt new file mode 100644 index 000000000..2c655243a --- /dev/null +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt @@ -0,0 +1,16 @@ +package com.dfsek.terra + +import org.gradle.api.Project + +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) + version + else //Only use git hash if it's a prerelease. + "$version-BETA+${getGitHash()}" +}