From ebe9000c9baa36a53dc63902b96956c9525ab052 Mon Sep 17 00:00:00 2001 From: ProGuard Date: Sun, 8 Dec 2019 15:28:51 +0000 Subject: [PATCH] Created ProGuard version 6.2.2. --- annotations/pom.xml | 2 +- ant/pom.xml | 2 +- buildscripts/pom.xml | 2 +- core/pom.xml | 2 +- core/src/META-INF/MANIFEST.MF | 1 + core/src/proguard/ProGuard.java | 2 +- docs/downloads.md | 5 +++-- docs/manual/gradle.md | 2 +- docs/manual/gradleplugin.md | 2 +- examples/android-plugin/build.gradle | 2 +- examples/android/build.gradle | 2 +- gradle/pom.xml | 14 +++++++++++++- gui/pom.xml | 2 +- gui/src/proguard/gui/GUIResources.properties | 2 +- retrace/pom.xml | 2 +- wtk/pom.xml | 2 +- 16 files changed, 30 insertions(+), 16 deletions(-) diff --git a/annotations/pom.xml b/annotations/pom.xml index 1bd645947..7a9944e16 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -8,7 +8,7 @@ net.sf.proguard proguard-parent - 6.2.1 + 6.2.2 ../buildscripts/pom.xml proguard-annotations diff --git a/ant/pom.xml b/ant/pom.xml index c5a5c1d35..914678a6d 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -8,7 +8,7 @@ net.sf.proguard proguard-parent - 6.2.1 + 6.2.2 ../buildscripts/pom.xml proguard-anttask diff --git a/buildscripts/pom.xml b/buildscripts/pom.xml index 937ec3e73..a1e8e9809 100644 --- a/buildscripts/pom.xml +++ b/buildscripts/pom.xml @@ -7,7 +7,7 @@ net.sf.proguard proguard-parent - 6.2.1 + 6.2.2 pom [${project.groupId}] ${project.artifactId} ProGuard is a free Java class file shrinker, optimizer, obfuscator, and preverifier. diff --git a/core/pom.xml b/core/pom.xml index 9fbd93cad..9bd90bbfb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -8,7 +8,7 @@ net.sf.proguard proguard-parent - 6.2.1 + 6.2.2 ../buildscripts/pom.xml proguard-base diff --git a/core/src/META-INF/MANIFEST.MF b/core/src/META-INF/MANIFEST.MF index 3bad15ec1..cf6075cc4 100644 --- a/core/src/META-INF/MANIFEST.MF +++ b/core/src/META-INF/MANIFEST.MF @@ -1,2 +1,3 @@ Manifest-Version: 1.0 Main-Class: proguard.ProGuard +Class-Path: gson-2.8.5.jar diff --git a/core/src/proguard/ProGuard.java b/core/src/proguard/ProGuard.java index b8912ba04..1f5f24f74 100644 --- a/core/src/proguard/ProGuard.java +++ b/core/src/proguard/ProGuard.java @@ -44,7 +44,7 @@ */ public class ProGuard { - public static final String VERSION = "ProGuard, version 6.2.1"; + public static final String VERSION = "ProGuard, version 6.2.2"; private final Configuration configuration; private ClassPool programClassPool = new ClassPool(); diff --git a/docs/downloads.md b/docs/downloads.md index 3fd0f5fc8..049337368 100644 --- a/docs/downloads.md +++ b/docs/downloads.md @@ -25,13 +25,14 @@ don't be afraid to update. | | | | |--------|----------|----------|---------------------------------- +| 6.2.2 | | GRADLE | Fixed missing runtime dependencies. | 6.2.1 | PGD-12 | GRADLE | Fixed build of Gradle plugin. | 6.2.1 | DGD-827 | CORE | Fixed retracing of obfuscated class / method names in some cases. | 6.2.1 | PGD-15 | CORE | Fixed potential `ClassFormatError` due to corrupt LineNumberTables when processing class files generated by groovy 2.5.5+. -| 6.2.1 | DGD-1503 | CORE | Added default filter to prevent processing of versioned class files. +| 6.2.1 | DGD-1503 | CORE | Added default filter to prevent processing of versioned class files. | 6.2.1 | DGD-1364 | DOCS | Documented the mapping file format. | 6.2.1 | DGD-950 | CORE | Fixed potential `EmptyStackException` when generating mapping files with inlined methods in rare cases. -| 6.2.1 | PGD-10 | CORE | Fixed potential `VerifyError` when optimizing classes with class version `11+` due to nest based access. +| 6.2.1 | PGD-10 | CORE | Fixed potential `VerifyError` when optimizing classes with class version `11+` due to nest based access. | 6.2.1 | PGD-11 | CORE | Fixed gradle example for processing libraries. | 6.2.1 | PGD-8 | CORE | Fixed potential `IllegalArgumentException` with message `Value "x" is not a reference value` when optimizing code with conditional casts. | 6.2.1 | DGD-1424 | CORE | Fixed incomplete fix in case of inlining method with type annotations. diff --git a/docs/manual/gradle.md b/docs/manual/gradle.md index 8b6815e94..71e6dcd7e 100644 --- a/docs/manual/gradle.md +++ b/docs/manual/gradle.md @@ -10,7 +10,7 @@ line to your **`build.gradle`** file: jcenter() } dependencies { - classpath 'net.sf.proguard:proguard-gradle:6.2.1' + classpath 'net.sf.proguard:proguard-gradle:6.2.2' } } diff --git a/docs/manual/gradleplugin.md b/docs/manual/gradleplugin.md index f0f4aa6ca..8ad31e4b9 100644 --- a/docs/manual/gradleplugin.md +++ b/docs/manual/gradleplugin.md @@ -39,7 +39,7 @@ project as follows: } dependencies { classpath 'com.android.tools.build:gradle:3.3.0' - classpath 'net.sf.proguard:proguard-gradle:6.2.1' + classpath 'net.sf.proguard:proguard-gradle:6.2.2' } } diff --git a/examples/android-plugin/build.gradle b/examples/android-plugin/build.gradle index e2bf9e22d..e22999085 100644 --- a/examples/android-plugin/build.gradle +++ b/examples/android-plugin/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { //classpath ':proguard:' // For the local copy of the ProGuard plugin. - classpath 'net.sf.proguard:proguard-gradle:6.2.1' // For the copy from Jcenter. + classpath 'net.sf.proguard:proguard-gradle:6.2.2' // For the copy from Jcenter. classpath 'com.android.tools.build:gradle:3.3.0' } } diff --git a/examples/android/build.gradle b/examples/android/build.gradle index a91f0b948..2b6f71eed 100644 --- a/examples/android/build.gradle +++ b/examples/android/build.gradle @@ -10,7 +10,7 @@ buildscript { resolutionStrategy { // Override the default version of ProGuard // with the most recent one. - force 'net.sf.proguard:proguard-gradle:6.2.1' + force 'net.sf.proguard:proguard-gradle:6.2.2' } } } diff --git a/gradle/pom.xml b/gradle/pom.xml index 9ba5b0cbd..ee50c2770 100644 --- a/gradle/pom.xml +++ b/gradle/pom.xml @@ -8,7 +8,7 @@ net.sf.proguard proguard-parent - 6.2.1 + 6.2.2 ../buildscripts/pom.xml proguard-gradle @@ -76,61 +76,73 @@ com.android.tools.build gradle 3.0.0 + provided org.gradle gradle-base-services 6.0.1 + provided org.gradle gradle-base-services-groovy 6.0.1 + provided org.gradle gradle-core 6.0.1 + provided org.gradle gradle-core-api 6.0.1 + provided org.gradle gradle-language-java 6.0.1 + provided org.gradle gradle-logging 6.0.1 + provided org.gradle gradle-model-core 6.0.1 + provided org.gradle gradle-process-services 6.0.1 + provided org.gradle gradle-workers 6.0.1 + provided org.codehaus.groovy groovy-all 2.4.7 + provided org.slf4j slf4j-api 1.7.25 + provided diff --git a/gui/pom.xml b/gui/pom.xml index d0cb22f02..90c05bce7 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -8,7 +8,7 @@ net.sf.proguard proguard-parent - 6.2.1 + 6.2.2 ../buildscripts/pom.xml proguard-gui diff --git a/gui/src/proguard/gui/GUIResources.properties b/gui/src/proguard/gui/GUIResources.properties index 6660ab269..e55f912ac 100644 --- a/gui/src/proguard/gui/GUIResources.properties +++ b/gui/src/proguard/gui/GUIResources.properties @@ -25,7 +25,7 @@ preverification = Preverification # # Panel titles. # -welcome = Welcome to ProGuard, version 6.2.1 +welcome = Welcome to ProGuard, version 6.2.2 options = Options keepAdditional = Keep additional classes and class members keepNamesAdditional = Keep additional class names and class member names diff --git a/retrace/pom.xml b/retrace/pom.xml index 16476944f..d1b940513 100644 --- a/retrace/pom.xml +++ b/retrace/pom.xml @@ -8,7 +8,7 @@ net.sf.proguard proguard-parent - 6.2.1 + 6.2.2 ../buildscripts/pom.xml proguard-retrace diff --git a/wtk/pom.xml b/wtk/pom.xml index 0b029e2c4..bff261da2 100644 --- a/wtk/pom.xml +++ b/wtk/pom.xml @@ -8,7 +8,7 @@ net.sf.proguard proguard-parent - 6.2.1 + 6.2.2 ../buildscripts/pom.xml proguard-wtk-plugin