Use property for publishing version string

The previous solution using `rootProject.ext.versionForPublishing` failed when building Aerie locally from a separate Gradle project, likely due to `rootProject` taking on a different value/meaning in that context. Using a global property here we're able to specify the publishing version in the top-level build and guarentee that any uses of it are localized to subprojects of our top-level build.
NASA-AMMOS · Nov 2, 2022 · a9e87b1 · a9e87b1
1 parent c14bcaf
commit a9e87b1
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -49,14 +49,15 @@ configure(subprojects.findAll { it.projectDir.toPath().resolve('sql').toFile().e
   archiveDeployment.dependsOn distributeSql
 }
 
-project.ext.versionForPublishing = {
+// Set publishing version property globally for this project
+setProperty('publishing.version', {
   if (findProperty("version.isRelease").toBoolean()) {
     return "${findProperty("version.number")}"
   } else {
     def hash = 'git rev-parse --short HEAD'.execute().text.trim()
     return "${findProperty("version.number")}-SNAPSHOT-$hash"
   }
-}()
+}())
 
 subprojects {
   apply plugin: 'com.github.ben-manes.versions'

diff --git a/contrib/build.gradle b/contrib/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 publishing {
   publications {
     library(MavenPublication) {
-      version = rootProject.ext.versionForPublishing
+      version = findProperty('publishing.version')
       from components.java
     }
   }

diff --git a/examples/banananation/build.gradle b/examples/banananation/build.gradle
@@ -42,7 +42,7 @@ javadoc.options.tags = [ "contact", "subsystem" ]
 publishing {
   publications {
     library(MavenPublication) {
-      version = rootProject.ext.versionForPublishing
+      version = findProperty('publishing.version')
       from components.java
     }
   }

diff --git a/gradle.properties b/gradle.properties
@@ -4,10 +4,14 @@ publishing.url=https://maven.pkg.github.com/nasa-ammos/aerie
 publishing.usernameEnvironmentVariable=GITHUB_ACTOR
 publishing.passwordEnvironmentVariable=GITHUB_TOKEN
 
+# Left empty, is lazily set when building
+publishing.version=
+
 # Override for releases
 
 # Change the version number here
 version.number=0.13.2
+
 # If you are publishing a release *manually* (i.e. not through github actions),
 # override this on the command line with `./gradlew publish -Pversion.isRelease=true`.
-version.isRelease=false // override this on the command line
+version.isRelease=false
diff --git a/merlin-driver/build.gradle b/merlin-driver/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 publishing {
   publications {
     library(MavenPublication) {
-      version = rootProject.ext.versionForPublishing
+      version = findProperty('publishing.version')
       from components.java
     }
   }

diff --git a/merlin-framework-junit/build.gradle b/merlin-framework-junit/build.gradle
@@ -26,7 +26,7 @@ dependencies {
 publishing {
   publications {
     library(MavenPublication) {
-      version = rootProject.ext.versionForPublishing
+      version = findProperty('publishing.version')
       from components.java
     }
   }

diff --git a/merlin-framework-processor/build.gradle b/merlin-framework-processor/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 publishing {
   publications {
     library(MavenPublication) {
-      version = rootProject.ext.versionForPublishing
+      version = findProperty('publishing.version')
       from components.java
     }
   }

diff --git a/merlin-framework/build.gradle b/merlin-framework/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 publishing {
   publications {
     library(MavenPublication) {
-      version = rootProject.ext.versionForPublishing
+      version = findProperty('publishing.version')
       from components.java
     }
   }

diff --git a/merlin-sdk/build.gradle b/merlin-sdk/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 publishing {
   publications {
     library(MavenPublication) {
-      version = rootProject.ext.versionForPublishing
+      version = findProperty('publishing.version')
       from components.java
     }
   }

diff --git a/parsing-utilities/build.gradle b/parsing-utilities/build.gradle
@@ -23,7 +23,7 @@ dependencies {
 publishing {
   publications {
     library(MavenPublication) {
-      version = rootProject.ext.versionForPublishing
+      version = findProperty('publishing.version')
       from components.java
     }
   }