diff -Nru proguard-6.2.2/debian/changelog proguard-6.2.2/debian/changelog
--- proguard-6.2.2/debian/changelog	2023-01-28 14:03:27.000000000 +0000
+++ proguard-6.2.2/debian/changelog	2023-01-30 11:35:38.000000000 +0000
@@ -1,3 +1,10 @@
+proguard (6.2.2-3) unstable; urgency=medium
+
+  * Team upload.
+  * Restored the Gradle task
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 30 Jan 2023 12:35:38 +0100
+
 proguard (6.2.2-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru proguard-6.2.2/debian/patches/02-build-classpath.patch proguard-6.2.2/debian/patches/02-build-classpath.patch
--- proguard-6.2.2/debian/patches/02-build-classpath.patch	1970-01-01 00:00:00.000000000 +0000
+++ proguard-6.2.2/debian/patches/02-build-classpath.patch	2023-01-30 11:24:41.000000000 +0000
@@ -0,0 +1,21 @@
+Description: Adjusts the classpath to build the Gradle plugin
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/gradle/build.sh
++++ b/gradle/build.sh
+@@ -88,8 +88,13 @@
+ GRADLE_HOME=${GRADLE_HOME:-/usr/local/java/gradle}
+ 
+ GRADLE_PATH=\
+-$(echo $HOME/.gradle/caches/5.4.1/generated-gradle-jars/gradle-api-5.4.1.jar):\
+-$(echo $GRADLE_HOME/lib/groovy-all-*.jar):\
++$(echo /usr/share/java/gradle-base-services.jar):\
++$(echo /usr/share/java/gradle-base-services-groovy.jar):\
++$(echo /usr/share/java/gradle-core.jar):\
++$(echo /usr/share/java/gradle-core-api.jar):\
++$(echo /usr/share/java/gradle-logging.jar):\
++$(echo /usr/share/java/groovy-all.jar):\
++$(echo /usr/share/java/slf4j-api.jar):\
+ $(echo $GRADLE_HOME/lib/gradle-installation-beacon-*.jar)
+ 
+ # Make sure the Gradle jars are present.
diff -Nru proguard-6.2.2/debian/patches/05-disable-gson-download.patch proguard-6.2.2/debian/patches/05-disable-gson-download.patch
--- proguard-6.2.2/debian/patches/05-disable-gson-download.patch	1970-01-01 00:00:00.000000000 +0000
+++ proguard-6.2.2/debian/patches/05-disable-gson-download.patch	2023-01-30 10:28:59.000000000 +0000
@@ -0,0 +1,21 @@
+Description: disable download of GSON jar
+Author: tony mancill <tmancill@debian.org>
+Forwarded: not-needed
+--- a/core/build.sh
++++ b/core/build.sh
+@@ -8,10 +8,11 @@
+ 
+ MAIN_CLASS=proguard.ProGuard
+ 
+-GSON_VERSION=2.8.5
+-GSON_URL=https://jcenter.bintray.com/com/google/code/gson/gson/${GSON_VERSION}/gson-${GSON_VERSION}.jar
+-GSON_JAR=$LIB/gson-${GSON_VERSION}.jar
++GSON_JAR=/usr/share/java/gson.jar
++#GSON_VERSION=2.8.5
++#GSON_URL=https://jcenter.bintray.com/com/google/code/gson/gson/${GSON_VERSION}/gson-${GSON_VERSION}.jar
++#GSON_JAR=$LIB/gson-${GSON_VERSION}.jar
+ 
+-download  "$GSON_URL" "$GSON_JAR" && \
++#download  "$GSON_URL" "$GSON_JAR" && \
+ compile   $MAIN_CLASS "$GSON_JAR" && \
+ createjar "$PROGUARD_JAR" || exit 1
diff -Nru proguard-6.2.2/debian/patches/05-disable-gson-download.sh proguard-6.2.2/debian/patches/05-disable-gson-download.sh
--- proguard-6.2.2/debian/patches/05-disable-gson-download.sh	2023-01-28 14:03:09.000000000 +0000
+++ proguard-6.2.2/debian/patches/05-disable-gson-download.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-Description: disable download of GSON jar
-Author: tony mancill <tmancill@debian.org>
-Forwarded: not-needed
-
---- a/core/build.sh
-+++ b/core/build.sh
-@@ -8,10 +8,11 @@
- 
- MAIN_CLASS=proguard.ProGuard
- 
--GSON_VERSION=2.8.5
--GSON_URL=https://jcenter.bintray.com/com/google/code/gson/gson/${GSON_VERSION}/gson-${GSON_VERSION}.jar
--GSON_JAR=$LIB/gson-${GSON_VERSION}.jar
-+GSON_JAR=/usr/share/java/gson.jar
-+#GSON_VERSION=2.8.5
-+#GSON_URL=https://jcenter.bintray.com/com/google/code/gson/gson/${GSON_VERSION}/gson-${GSON_VERSION}.jar
-+#GSON_JAR=$LIB/gson-${GSON_VERSION}.jar
- 
--download  "$GSON_URL" "$GSON_JAR" && \
-+#download  "$GSON_URL" "$GSON_JAR" && \
- compile   $MAIN_CLASS "$GSON_JAR" && \
- createjar "$PROGUARD_JAR" || exit 1
diff -Nru proguard-6.2.2/debian/patches/06-disable-android-support.patch proguard-6.2.2/debian/patches/06-disable-android-support.patch
--- proguard-6.2.2/debian/patches/06-disable-android-support.patch	1970-01-01 00:00:00.000000000 +0000
+++ proguard-6.2.2/debian/patches/06-disable-android-support.patch	2023-01-30 11:35:11.000000000 +0000
@@ -0,0 +1,28 @@
+Description: Disables Android support
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/gradle/build.sh
++++ b/gradle/build.sh
+@@ -6,7 +6,7 @@
+ 
+ source ../buildscripts/functions.sh
+ 
+-MAIN_CLASS=proguard.gradle.*
++MAIN_CLASS=proguard.gradle.ProGuardTask
+ 
+ ANDROID_PATH=\
+ $(echo $HOME/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/3.0.0/*/gradle-3.0.0.jar):\
+@@ -77,13 +77,6 @@
+ $(echo $HOME/.gradle/caches/modules-2/files-2.1/com.android.tools.external.com-intellij/intellij-core/26.0.0/*/intellij-core-26.0.0.jar):\
+ $(echo $HOME/.gradle/caches/modules-2/files-2.1/org.jetbrains.trove4j/trove4j/20160824/*/trove4j-20160824.jar)
+ 
+-# Make sure the Android jars are present.
+-if [[ "$ANDROID_PATH" == *\** ]]; then
+-  echo "Please make sure you have downloaded the Android tools jars by building"
+-  echo "with Gradle 5.4.1 first, if you want to compile the optional ProGuard Gradle"
+-  echo "task and plugin."
+-  exit 1
+-fi
+ 
+ GRADLE_HOME=${GRADLE_HOME:-/usr/local/java/gradle}
+ 
diff -Nru proguard-6.2.2/debian/patches/series proguard-6.2.2/debian/patches/series
--- proguard-6.2.2/debian/patches/series	2023-01-28 14:03:09.000000000 +0000
+++ proguard-6.2.2/debian/patches/series	2023-01-30 11:35:22.000000000 +0000
@@ -1,3 +1,5 @@
 01-fix-usage.patch
+02-build-classpath.patch
 03-disable-wtk-plugin.patch
-05-disable-gson-download.sh
+05-disable-gson-download.patch
+06-disable-android-support.patch