From d50df9994661168a95f696f331087edc7939ac09 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sun, 13 Mar 2022 16:23:18 +0100
Subject: [PATCH] No longer build fat jars, but rely on gradle application
 instead

---
 wkd-java-cli/build.gradle   | 20 +++-----------------
 wkd-test-suite/build.gradle | 16 ++--------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/wkd-java-cli/build.gradle b/wkd-java-cli/build.gradle
index 219adf2..fa1aaba 100644
--- a/wkd-java-cli/build.gradle
+++ b/wkd-java-cli/build.gradle
@@ -35,20 +35,6 @@ test {
     useJUnitPlatform()
 }
 
-
-mainClassName = 'pgp.wkd.cli.WKDCLI'
-
-jar {
-    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
-    manifest {
-        attributes 'Main-Class': "$mainClassName"
-    }
-
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    } {
-        exclude "META-INF/*.SF"
-        exclude "META-INF/*.DSA"
-        exclude "META-INF/*.RSA"
-    }
-}
\ No newline at end of file
+application {
+    mainClass = 'pgp.wkd.cli.WKDCLI'
+}
diff --git a/wkd-test-suite/build.gradle b/wkd-test-suite/build.gradle
index 9f835b1..fb48726 100644
--- a/wkd-test-suite/build.gradle
+++ b/wkd-test-suite/build.gradle
@@ -32,21 +32,9 @@ dependencies {
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
 }
-mainClassName = 'pgp.wkd.test_suite.Main'
 
-jar {
-    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
-    manifest {
-        attributes 'Main-Class': "$mainClassName"
-    }
-
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    } {
-        exclude "META-INF/*.SF"
-        exclude "META-INF/*.DSA"
-        exclude "META-INF/*.RSA"
-    }
+application {
+    mainClass = 'pgp.wkd.test_suite.Main'
 }
 
 test {