Emmanuel Bourg pushed to branch master at Debian Java Maintainers / proguard
Commits: c2094f40 by Emmanuel Bourg at 2023-01-30T09:56:33+01:00 Renamed the disable-gson-download patch - - - - - 02c19111 by Emmanuel Bourg at 2023-01-30T12:35:44+01:00 Restored the Gradle task - - - - - 5 changed files: - debian/changelog - + debian/patches/02-build-classpath.patch - debian/patches/05-disable-gson-download.sh → debian/patches/05-disable-gson-download.patch - + debian/patches/06-disable-android-support.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +proguard (6.2.2-3) unstable; urgency=medium + + * Team upload. + * Restored the Gradle task + + -- Emmanuel Bourg <ebo...@apache.org> Mon, 30 Jan 2023 12:35:38 +0100 + proguard (6.2.2-2) unstable; urgency=medium * Team upload. ===================================== debian/patches/02-build-classpath.patch ===================================== @@ -0,0 +1,21 @@ +Description: Adjusts the classpath to build the Gradle plugin +Author: Emmanuel Bourg <ebo...@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. ===================================== debian/patches/05-disable-gson-download.sh → debian/patches/05-disable-gson-download.patch ===================================== @@ -1,7 +1,6 @@ Description: disable download of GSON jar Author: tony mancill <tmanc...@debian.org> Forwarded: not-needed - --- a/core/build.sh +++ b/core/build.sh @@ -8,10 +8,11 @@ ===================================== debian/patches/06-disable-android-support.patch ===================================== @@ -0,0 +1,28 @@ +Description: Disables Android support +Author: Emmanuel Bourg <ebo...@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} + ===================================== debian/patches/series ===================================== @@ -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 View it on GitLab: https://salsa.debian.org/java-team/proguard/-/compare/90141f7d65da25d2650035c5e6ef4499644eb6d2...02c1911160e7e07d30f7cfb1bdf61aca6abcd061 -- View it on GitLab: https://salsa.debian.org/java-team/proguard/-/compare/90141f7d65da25d2650035c5e6ef4499644eb6d2...02c1911160e7e07d30f7cfb1bdf61aca6abcd061 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits