diff --git a/build.gradle b/build.gradle index 0d4d3d65d..e4724d152 100644 --- a/build.gradle +++ b/build.gradle @@ -27,4 +27,5 @@ project.ext { privateExtensions = file("$rootDir/private_extensions.txt").exists() ? file("$rootDir/private_extensions.txt").readLines() : [] isFullRelease = System.getenv('RELEASE') != null && Boolean.parseBoolean(System.getenv('RELEASE')) versionString = file('version').text + (isFullRelease ? '' : '-SNAPSHOT') + canonicalVersionString = file('version').text } diff --git a/dist/jpackage.gradle b/dist/jpackage.gradle index 4947e803d..76bf3985c 100644 --- a/dist/jpackage.gradle +++ b/dist/jpackage.gradle @@ -55,10 +55,10 @@ jlink { imageName = 'xpiped' if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { icon = "logo/logo.ico" - appVersion = version + appVersion = rootProject.canonicalVersionString } else if (org.gradle.internal.os.OperatingSystem.current().isLinux()) { icon = "logo/logo.png" - appVersion = version + appVersion = rootProject.canonicalVersionString } else { icon = "logo/logo.icns" @@ -80,7 +80,7 @@ jlink { resourceDir = file("$projectDir/misc/mac") // Mac does not like a zero major version - def modifiedVersion = version.toString() + def modifiedVersion = rootProject.canonicalVersionString if (Integer.parseInt(modifiedVersion.substring(0, 1)) == 0) { modifiedVersion = "1" + modifiedVersion.substring(1) } diff --git a/private_extensions.txt b/private_extensions.txt deleted file mode 100644 index 53cf60f9a..000000000 --- a/private_extensions.txt +++ /dev/null @@ -1,2 +0,0 @@ -jdbcx -office