summarylogtreecommitdiffstats
path: root/java-version-and-build-version.patch
blob: b3e1d4984d9c0cc60080639deb35df162c0beb56 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
diff -u --label \#\<buffer\ build.gradle.orig\> --label \#\<buffer\ build.gradle\> /tmp/buffer-content-drlQHV /tmp/buffer-content-A9SB0J
--- #<buffer build.gradle.orig>
+++ #<buffer build.gradle>
@@ -7,16 +7,13 @@
 
     id 'jacoco'
 
-    id 'com.github.johnrengelman.shadow' version '6.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'com.github.ben-manes.versions' version '0.33.0'
-    id 'com.palantir.git-version' version '0.12.3'
 }
 
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
-/* git version */
-def gitVersionDetails = versionDetails()
-version = gitVersionDetails.lastTag
+version = "${System.env.BUILD_VERSION}"
 
 compileJava.options.encoding = "UTF-8"
 compileTestJava.options.encoding = "UTF-8"
@@ -25,12 +22,12 @@
     manifest {
         attributes 'Main-Class': 'cli.Main',
                 'Implementation-Title': 'Email to PDF Converter',
-                'Implementation-Version': archiveVersion.get() + "+${gitVersionDetails.branchName}.${gitVersionDetails.gitHash}"
+                'Implementation-Version': version
     }
 }
 
 shadowJar {
-    baseName = 'emailconverter'
+    archiveBaseName.set('emailconverter')
 }
 
 repositories {

Diff finished.  Mon May 27 21:53:32 2024