Merge branch 'main' into add.documentation

szabosteve · web-flow · commit 17c8a57633c7 · 2021-10-14T11:04:06.000+02:00
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -39,7 +39,7 @@ java {
 tasks.withType<ProcessResources> {
     expand(
         "version" to version,
-        "git_revision" to (rootProject.extra.get("gitHashFull") ?: "unknown")
+        "git_revision" to (if (rootProject.extra.has("gitHashFull")) rootProject.extra["gitHashFull"] else "unknown")
     )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ java {`
`39`	`39`	`tasks.withType<ProcessResources> {`
`40`	`40`	`expand(`
`41`	`41`	`"version" to version,`
`42`		`- "git_revision" to (rootProject.extra.get("gitHashFull") ?: "unknown")`
	`42`	`+ "git_revision" to (if (rootProject.extra.has("gitHashFull")) rootProject.extra["gitHashFull"] else "unknown")`
`43`	`43`	`)`
`44`	`44`	`}`
`45`	`45`