From 2d806bbfadd5fd347280d1df3243f85fb2a10a4c Mon Sep 17 00:00:00 2001
From: James Hamilton <james.hamilton@guardsquare.com>
Date: Mon, 26 Jul 2021 20:17:14 +0200
Subject: [PATCH] Add multi-release: true to jar artifcats

Required, due to log4j2 included in ProGuardCORE 8.0.0
---
 ant/build.gradle          | 1 +
 base/build.gradle         | 8 +++++++-
 gui/build.gradle          | 1 +
 proguard-app/build.gradle | 1 +
 retrace/build.gradle      | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ant/build.gradle b/ant/build.gradle
index b0bb3e75..c774b921 100644
--- a/ant/build.gradle
+++ b/ant/build.gradle
@@ -40,6 +40,7 @@ task fatJar(type: ShadowJar) {
     manifest {
         attributes(
                 'Manifest-Version': '1.0',
+                'Multi-Release': true,
                 'Implementation-Version': archiveVersion.get())
     }
 }
diff --git a/base/build.gradle b/base/build.gradle
index 21e98e3a..5bf85679 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -42,7 +42,13 @@ dependencies {
     }
 }
 
-jar.manifest.attributes('Implementation-Version': version)
+jar {
+    manifest {
+        attributes(
+                'Multi-Release': true,
+                'Implementation-Version': archiveVersion.get())
+    }
+}
 
 // Early access automatic downloads are not yet supported:
 // https://github.com/gradle/gradle/issues/14814
diff --git a/gui/build.gradle b/gui/build.gradle
index 61274ded..4f3793b1 100644
--- a/gui/build.gradle
+++ b/gui/build.gradle
@@ -41,6 +41,7 @@ task fatJar(type: ShadowJar) {
         attributes(
                 'Manifest-Version': '1.0',
                 'Main-Class': 'proguard.gui.ProGuardGUI',
+                'Multi-Release': true,
                 'Implementation-Version': archiveVersion.get())
     }
 }
diff --git a/proguard-app/build.gradle b/proguard-app/build.gradle
index 670ab5d6..06c1212f 100644
--- a/proguard-app/build.gradle
+++ b/proguard-app/build.gradle
@@ -27,6 +27,7 @@ task fatJar(type: ShadowJar) {
     manifest {
         attributes(
                 'Main-Class': 'proguard.ProGuard',
+                'Multi-Release': true,
                 'Implementation-Version': archiveVersion.get())
     }
 }
diff --git a/retrace/build.gradle b/retrace/build.gradle
index 1030a072..adfcfc10 100644
--- a/retrace/build.gradle
+++ b/retrace/build.gradle
@@ -38,6 +38,7 @@ task fatJar(type: ShadowJar) {
     manifest {
         attributes(
                 'Manifest-Version': '1.0',
+                'Multi-Release': true,
                 'Main-Class': 'proguard.retrace.ReTrace')
     }
 }