Created ProGuard version 6.2.1.

Author: ProGuard

annotations/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>6.2.0</version>
+        <version>6.2.1</version>
         <relativePath>../buildscripts/pom.xml</relativePath>
     </parent>
     <artifactId>proguard-annotations</artifactId>

ant/build.sh

@@ -19,13 +19,10 @@ if [ ! -f "$ANT_JAR" ]; then
   exit 1
 fi
 
-# Make sure the ProGuard core has been compiled.
-if [ ! -d ../core/$OUT ]; then
+# Make sure ProGuard has been compiled.
+if [[ ! -d ../core/$OUT || ! -f "$PROGUARD_JAR" ]]; then
   ../core/build.sh || exit 1
 fi
 
-# Compile and package.
-export CLASSPATH=../core/$OUT:$ANT_JAR
-
-compile   $MAIN_CLASS && \
+compile   $MAIN_CLASS "../core/$OUT:$ANT_JAR" && \
 updatejar "$PROGUARD_JAR" || exit 1

ant/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>6.2.0</version>
+        <version>6.2.1</version>
         <relativePath>../buildscripts/pom.xml</relativePath>
     </parent>
     <artifactId>proguard-anttask</artifactId>

buildscripts/README

@@ -27,4 +27,4 @@ Pick your favorite build tool and enjoy!
 
 https://www.guardsquare.com/proguard
 
-Copyright (c) 2002-2019 Eric Lafortune @ GuardSquare
+Copyright (c) 2002-2019 Guardsquare

buildscripts/functions.mk

@@ -19,7 +19,11 @@ TARGET_JAR = $(LIB)/$(TARGET).jar
 DOWNLOAD = wget -O
 #DOWNLOAD = curl -L -o
 
-# Function to find the resource files of a given target.
+# Functions to find the class files and resource files of a given target.
+
+define CLASS_FILES
+  $(subst .java,.class,$(shell find $(SRC)/$(dir $(1)) -path "$(SRC)/$(MAIN_CLASS).java" -printf $(OUT)/$(dir $(1))%P\\n))
+endef
 
 define RESOURCES
   $(shell find $(SRC)/$(dir $(1)) -maxdepth 1 \( -name \*.properties -o -name \*.png -o -name \*.gif -o -name \*.pro \) -printf $(OUT)/$(dir $(1))%P\\n)
@@ -29,22 +33,26 @@ endef
 
 all: $(TARGET_JAR)
 
-$(TARGET_JAR): $(OUT)/$(MAIN_CLASS).class $(LIB)
+$(TARGET_JAR): $(call CLASS_FILES,$(MAIN_CLASS)) $(LIB)
 ifeq ($(UPDATE_JAR),true)
-	jar -uf  $@ -C $(OUT) $(dir $(MAIN_CLASS))
+ifeq ($(INCLUDE_MANIFEST),true)
+	jar -ufm $@ $(SRC)/META-INF/MANIFEST.MF -C $(OUT) $(dir $(MAIN_CLASS))
+else
+	jar -uf  $@                             -C $(OUT) $(dir $(MAIN_CLASS))
+endif
 else
 ifeq ($(INCLUDE_MANIFEST),true)
 	jar -cfm $@ $(SRC)/META-INF/MANIFEST.MF -C $(OUT) $(dir $(MAIN_CLASS))
 else
-	jar -cf $@ -C $(OUT) $(dir $(MAIN_CLASS))
+	jar -cf  $@                             -C $(OUT) $(dir $(MAIN_CLASS))
 endif
 endif
 
 $(TARGET_JAR): $(call RESOURCES,$(MAIN_CLASS))
 
 # Rule for compiling the class files.
 
-$(OUT)/%.class: $(SRC)/%.java $(subst :, ,$(CLASSPATH)) $(OUT)
+$(OUT)/%.class: $(OUT) $(SRC)/%.java $(subst :, ,$(CLASSPATH))
 	javac -nowarn -Xlint:none $(CLASSPATH_OPTION) -source $(JAVA_TARGET) -target $(JAVA_TARGET) -sourcepath $(SRC) -d $(OUT) $(filter %.java,$^) 2>&1 | sed -e 's|^|  |'
 
 # Rule for copying the resource files.

buildscripts/functions.sh

@@ -18,6 +18,7 @@ set -o pipefail
 function download {
   if [ ! -f "$2" ]; then
     echo "Downloading $2..."
+    mkdir -p $(dirname "$2") && \
     if type wget > /dev/null 2>&1; then
       wget -O "$2" "$1"
     else
@@ -27,34 +28,58 @@ function download {
 }
 
 function compile {
-  # Compile java source files.
   echo "Compiling $(basename $PWD) ($1)..."
   mkdir -p "$OUT" && \
-  javac -nowarn -Xlint:none -source $TARGET -target $TARGET \
+
+  # Compile Java source files.
+  find $SRC -name '_*.java' -o -path "$SRC/${1//.//}.java" \
+  | xargs --no-run-if-empty \
+    javac -nowarn -Xlint:none \
+    -source $TARGET -target $TARGET \
+    -sourcepath "$SRC" -d "$OUT" \
+    ${2:+-classpath "$2"} 2>&1 \
+  | sed -e 's|^|  |' || return 1
+
+  # Compile Kotlin source files.
+  #find $SRC -path "$SRC/${1//.//}.kotlin" \
+  #| xargs --no-run-if-empty \
+  #  kotlinc -nowarn -jvm-target $TARGET \
+  #  -d "$OUT" \
+  #  ${2:+-classpath "$2"} 2>&1 \
+  #| sed -e 's|^|  |' || return 1
+
+  # Compile Groovy source files.
+  find $SRC -path "$SRC/${1//.//}.groovy" \
+  | xargs --no-run-if-empty \
+    groovyc \
     -sourcepath "$SRC" -d "$OUT" \
-    ${2:+-classpath "$2"} \
-    `find $SRC -name _*.java` \
-    "$SRC"/${1//.//}.java 2>&1 \
-    | sed -e 's|^|  |' || return 1
+    ${2:+-classpath "$2"} 2>&1 \
+  | sed -e 's|^|  |' || return 1
 
   # Copy resource files.
   (cd "$SRC" && \
-   find proguard \
+   find \
      \( -name \*.properties -o -name \*.png -o -name \*.gif -o -name \*.pro \) \
      -exec cp --parents {} "../$OUT" \; )
 }
 
 function createjar {
   echo "Creating $1..."
+  DIRS=$(ls "$OUT" | sed -e "s|^|-C $OUT |")
   mkdir -p $(dirname "$1") && \
   if [ -f "$SRC/META-INF/MANIFEST.MF" ]; then
-    jar -cfm "$1" "$SRC/META-INF/MANIFEST.MF" -C "$OUT" proguard
+    jar -cfm "$1" "$SRC/META-INF/MANIFEST.MF" $DIRS
   else
-    jar -cf "$1" -C "$OUT" proguard
+    jar -cf "$1" $DIRS
   fi
 }
 
 function updatejar {
   echo "Updating $1..."
-  jar -uf "$1" -C "$OUT" proguard
+  DIRS=$(ls "$OUT" | sed -e "s|^|-C $OUT |")
+  if [ -f "$SRC/META-INF/MANIFEST.MF" ]; then
+    jar -ufm "$1" "$SRC/META-INF/MANIFEST.MF" $DIRS
+  else
+    jar -uf "$1" $DIRS
+  fi
 }

buildscripts/gradle.properties

@@ -2,4 +2,4 @@
 
 target = 1.8
 
-wtkDir=/usr/local/java/wtk2.1
+wtkDir = /usr/local/java/wtk2.1

buildscripts/pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>net.sf.proguard</groupId>
     <artifactId>proguard-parent</artifactId>
-    <version>6.2.0</version>
+    <version>6.2.1</version>
     <packaging>pom</packaging>
     <name>[${project.groupId}] ${project.artifactId}</name>
     <description>ProGuard is a free Java class file shrinker, optimizer, obfuscator, and preverifier.</description>
@@ -21,7 +21,7 @@
         <developer>
             <id>lafortune</id>
             <name>Eric Lafortune</name>
-            <url>https://www.lafortune.eu/</url>
+            <url>https://www.guardsquare.com/proguard</url>
             <organization>Guardsquare</organization>
             <organizationUrl>https://www.guardsquare.com/</organizationUrl>
             <roles>

core/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>6.2.0</version>
+        <version>6.2.1</version>
         <relativePath>../buildscripts/pom.xml</relativePath>
     </parent>
     <artifactId>proguard-base</artifactId>

core/src/proguard/DataEntryReaderFactory.java

@@ -24,7 +24,7 @@
 import proguard.io.*;
 import proguard.util.*;
 
-import java.util.List;
+import java.util.*;
 
 
 /**
@@ -36,6 +36,10 @@
  */
 public class DataEntryReaderFactory
 {
+    private static final String VERSIONS_PATTERN = "META-INF/versions";
+    private static final String VERSIONS_EXCLUDE = "!META-INF/versions/**";
+
+
     /**
      * Creates a DataEntryReader that can read the given class path entry.
      *
@@ -57,7 +61,7 @@ public static DataEntryReader createDataEntryReader(String          messagePrefi
         boolean isJmod = classPathEntry.isJmod();
         boolean isZip  = classPathEntry.isZip();
 
-        List filter     = classPathEntry.getFilter();
+        List filter     = getFilterExcludingVersionedClasses(classPathEntry);
         List apkFilter  = classPathEntry.getApkFilter();
         List jarFilter  = classPathEntry.getJarFilter();
         List aarFilter  = classPathEntry.getAarFilter();
@@ -191,4 +195,42 @@ private static DataEntryReader wrapInJarReader(DataEntryReader reader,
                        reader);
         }
     }
+
+
+    /**
+     * Method to return an augmented filter for supported features.
+     * <p>
+     * Currently versioned class files (a feature introduced in Java 9) are not fully
+     * supported by ProGuard. Only 1 version of a class can be read and processed.
+     * If no custom filter targeting a specific version is used, exclude such classes
+     * from being read.
+     */
+    public static List getFilterExcludingVersionedClasses(ClassPathEntry classPathEntry)
+    {
+        List originalFilter = classPathEntry.getFilter();
+        if (originalFilter == null)
+        {
+            return Arrays.asList(VERSIONS_EXCLUDE);
+        }
+        else
+        {
+            // If there is already a custom filter for versioned classes
+            // assume that the filter is properly setup.
+            ListIterator it = originalFilter.listIterator();
+            while (it.hasNext())
+            {
+                String element = (String) it.next();
+                if (element.contains(VERSIONS_PATTERN))
+                {
+                    return originalFilter;
+                }
+            }
+
+            // Otherwise, exclude all versioned classes.
+            List filter = new ArrayList();
+            filter.add(VERSIONS_EXCLUDE);
+            filter.addAll(originalFilter);
+            return filter;
+        }
+    }
 }