From ed008d52d512c12f6a0c777edd07b42653fc105a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 10:11:29 -0600
Subject: [PATCH] new gradle file for app version
---
build.gradle | 21 +--------------------
gradle/app-version.gradle | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+), 20 deletions(-)
create mode 100644 gradle/app-version.gradle
diff --git a/build.gradle b/build.gradle
index da64c54f..ad7f391a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ compileJava.options.encoding = "UTF-8"
compileTestJava.options.encoding = "UTF-8"
sourceCompatibility = JavaVersion.VERSION_11
+apply from: "${projectDir}/gradle/app-version.gradle"
apply from: "${projectDir}/gradle/git-hooks.gradle"
apply from: "${projectDir}/gradle/node.gradle"
apply from: "${projectDir}/gradle/repositories.gradle"
@@ -39,26 +40,6 @@ java {
withSourcesJar()
}
-jar {
- doFirst {
- def versionFile = new File("${projectDir}/src/main/resources/nshmp-lib-version.json")
- def details = versionDetails()
- def versionInfo = [
- branchName: details.branchName,
- commitDistance: details.commitDistance,
- gitHash: details.gitHash,
- gitHashFull: details.gitHashFull,
- isCleanTag: details.isCleanTag,
- lastTag: details.lastTag,
- projectName: project.name,
- url: 'git config --get remote.origin.url'.execute().text.replace('\n', ''),
- version: details.version,
- ]
- def json = groovy.json.JsonOutput.toJson(versionInfo)
- versionFile.write(groovy.json.JsonOutput.prettyPrint(json))
- }
-}
-
javadoc {
def docTitle = "<a href=\"https://code.usgs.gov/ghsc/nshmp/nshmp-lib.git\">${project.name}</a>"
options.setUse(true)
diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle
new file mode 100644
index 00000000..81cecf7d
--- /dev/null
+++ b/gradle/app-version.gradle
@@ -0,0 +1,24 @@
+apply plugin: "com.palantir.git-version"
+
+
+tasks.withType(JavaCompile) {
+ doFirst {
+ def versionFile = new File("${projectDir}/src/main/resources/version/nshmp-lib-version.json")
+ new File(versionFile.getParent()).mkdirs()
+ def details = versionDetails()
+ def versionInfo = [
+ branchName: details.branchName,
+ commitDistance: details.commitDistance,
+ gitHash: details.gitHash,
+ gitHashFull: details.gitHashFull,
+ isCleanTag: details.isCleanTag,
+ lastTag: details.lastTag,
+ projectName: project.name,
+ url: 'git config --get remote.origin.url'.execute().text.replace('\n', ''),
+ version: details.version,
+ ]
+ def json = groovy.json.JsonOutput.toJson(versionInfo)
+ versionFile.write(groovy.json.JsonOutput.prettyPrint(json))
+ }
+}
+
--
GitLab