LICENSE.md

+# GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place -
+Suite 330, Boston, MA 02111-1307, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+## Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it. By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users. This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it. (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it
+to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These
+restrictions translate to certain responsibilities for you if you distribute
+copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have. You must
+make sure that they, too, receive or can get the source code. And you must
+show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.
+We wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program
+proprietary. To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+## TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+**0.** This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed under the
+terms of this General Public License. The "Program", below, refers to any such
+program or work, and a "work based on the Program" means either the Program or
+any derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language. (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its
+contents constitute a work based on the Program (independent of having been
+made by running the Program). Whether that is true depends on what the Program
+does.
+
+**1.** You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+**2.** You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you
+also meet all of these conditions:
+
+- **a)** You must cause the modified files to carry prominent notices stating
+  that you changed the files and the date of any change.
+- **b)** You must cause any work that you distribute or publish, that in whole
+  or in part contains or is derived from the Program or any part thereof, to
+  be licensed as a whole at no charge to all third parties under the terms of
+  this License.
+- **c)** If the modified program normally reads commands interactively when
+  run, you must cause it, when started running for such interactive use in the
+  most ordinary way, to print or display an announcement including an
+  appropriate copyright notice and a notice that there is no warranty (or
+  else, saying that you provide a warranty) and that users may redistribute
+  the program under these conditions, and telling the user how to view a copy
+  of this License. (Exception: if the Program itself is interactive but does
+  not normally print such an announcement, your work based on the Program is
+  not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License,
+and its terms, do not apply to those sections when you distribute them as
+separate works. But when you distribute the same sections as part of a whole
+which is a work based on the Program, the distribution of the whole must be on
+the terms of this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with
+the Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+**3.** You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+- **a)** Accompany it with the complete corresponding machine-readable source
+  code, which must be distributed under the terms of Sections 1 and 2 above on
+  a medium customarily used for software interchange; or,
+- **b)** Accompany it with a written offer, valid for at least three years, to
+  give any third party, for a charge no more than your cost of physically
+  performing source distribution, a complete machine-readable copy of the
+  corresponding source code, to be distributed under the terms of Sections 1
+  and 2 above on a medium customarily used for software interchange; or,
+- **c)** Accompany it with the information you received as to the offer to
+  distribute corresponding source code. (This alternative is allowed only for
+  noncommercial distribution and only if you received the program in object
+  code or executable form with such an offer, in accord with Subsection b
+  above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it. For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and
+installation of the executable. However, as a special exception, the source
+code distributed need not include anything that is normally distributed (in
+either source or binary form) with the major components (compiler, kernel, and
+so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to
+copy from a designated place, then offering equivalent access to copy the
+source code from the same place counts as distribution of the source code,
+even though third parties are not compelled to copy the source along with the
+object code.
+
+**4.** You may not copy, modify, sublicense, or distribute the Program except
+as expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense or distribute the Program is void, and will automatically
+terminate your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+**5.** You are not required to accept this License, since you have not signed
+it. However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you do
+not accept this License. Therefore, by modifying or distributing the Program
+(or any work based on the Program), you indicate your acceptance of this
+License to do so, and all its terms and conditions for copying, distributing
+or modifying the Program or works based on it.
+
+**6.** Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+**7.** If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or otherwise)
+that contradict the conditions of this License, they do not excuse you from
+the conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+**8.** If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+**9.** The Free Software Foundation may publish revised and/or new versions of
+the General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address
+new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of this License,
+you may choose any version ever published by the Free Software Foundation.
+
+**10.** If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author to
+ask for permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make
+exceptions for this. Our decision will be guided by the two goals of
+preserving the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+
+**NO WARRANTY**
+
+**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE
+THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO
+LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR
+THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.

LICENSE_exception.md

+# Special Exception to the GNU General Public License
+
+Copyright © 2002-2019 Guardsquare NV
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+In addition, as a special exception, Guardsquare NV gives permission to link
+the code of this program with the following stand-alone applications:
+
+- Gradle,
+- Apache Ant,
+- Apache Maven,
+- the Google Android SDK,
+- the Intel TXE/DAL SDK,
+- the Eclipse ProGuardDT GUI,
+- the EclipseME JME IDE,
+- the Oracle NetBeans Java IDE,
+- the Oracle JME Wireless Toolkit, and
+- the Simple Build Tool for Scala (and its scripts).
+
+and distribute linked combinations including the two. You must obey the GNU
+General Public License in all respects for all of the code used other than
+these programs. If you modify this file, you may extend this exception to your
+version of the file, but you are not obligated to do so. If you do not wish to
+do so, delete this exception statement from your version.

README → README.md

-ProGuard, Java class file shrinker, optimizer, obfuscator, and preverifier
-==========================================================================
+ProGuard, Java bytecode optimizer and obfuscator
+================================================
 
 This distribution contains the following directories:
 
 - bin          : simple wrapper scripts to run ProGuard, its GUI, and ReTrace
 - lib          : the main jars, compiled and ready to use with "java -jar ...."
-- docs         : the complete documentation, licenses, etc. in html format
-- examples     : some example configuration files
+- examples     : some example configuration files and projects
 
-It also contains the source code and builds scripts:
+It also contains the source code and build scripts:
 
 - core         : the ProGuard core
 - retrace      : the ReTrace tool
@@ -19,8 +18,7 @@ It also contains the source code and builds scripts:
 - annotations  : the optional annotations to configure ProGuard
 - buildscripts : various alternative build scripts
 
-
-The best place to start is docs/index.html
+The best place to start is the [on-line manual](https://www.guardsquare.com/proguard).
 
 
 Example
@@ -32,11 +30,35 @@ jar itself:
     cd examples/standalone
     ../../bin/proguard.sh @ proguard.pro
 
-The resulting proguard_out.jar contains the same application, but it's a lot
+The resulting proguard\_out.jar contains the same application, but it's a lot
 smaller.
 
+
+Android example
+---------------
+
+If you want to see this version of ProGuard integrated in an Android project,
+you can look at the small Android HelloWorld project:
+
+    cd examples/android
+    gradle assembleRelease
+
+
+Downloads
+---------
+
+You can download ProGuard in various forms:
+
+- [Pre-built artifacts](https://bintray.com/guardsquare/proguard) at JCenter
+- [Pre-built artifacts](https://search.maven.org/search?q=g:net.sf.proguard) at Maven Central
+- [Traditional pre-built archives](https://sourceforge.net/projects/proguard/files/) at Sourceforge
+- A [Mercurial repository of the source code](https://sourceforge.net/p/proguard/code/) at Sourceforge
+- A [Git repository of the source code](https://github.com/Guardsquare/proguard) at Github
+- The [complete ProGuard manual](https://www.guardsquare.com/proguard) at Guardsquare
+
+
 Enjoy!
 
 https://www.guardsquare.com/proguard
 
-Copyright (c) 2002-2018 Eric Lafortune @ GuardSquare
+Copyright (c) 2002-2019 Guardsquare NV

annotations/build.gradle

@@ -2,6 +2,9 @@
 
 apply plugin: 'java'
 
+sourceCompatibility = "${target}"
+targetCompatibility = "${target}"
+
 sourceSets.main {
     java {
         srcDirs = ['src']

annotations/build.xml

@@ -3,6 +3,8 @@
 <project name    = "annotations"
          default = "dist">
 
+  <property file = "../buildscripts/ant.properties"/>
+
   <target name = "clean">
     <delete quiet = "true">
       <fileset dir   = "out"/>
@@ -17,6 +19,8 @@
     <javac nowarn            = "true"
            deprecation       = "false"
            includeantruntime = "false"
+           source            = "${target}"
+           target            = "${target}"
            srcdir            = "src"
            destdir           = "out"
            includes          = "proguard/annotation/*.java">

annotations/gradle.properties

+# Gradle build properties for the ProGuard annotations.
+
+target = 1.8

annotations/pom.xml

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

ant/build.gradle

@@ -6,6 +6,9 @@ repositories {
     jcenter()
 }
 
+sourceCompatibility = "${target}"
+targetCompatibility = "${target}"
+
 sourceSets.main {
     java {
         srcDirs = ['src']

ant/build.xml

@@ -3,7 +3,8 @@
 <project name    = "ant"
          default = "dist">
 
-  <property file = "build.properties"/>
+  <property file = "../buildscripts/ant.properties"/>
+  <property file = "ant.properties"/>
 
   <target name = "clean">
     <delete quiet = "true">
@@ -25,6 +26,8 @@
     <javac nowarn            = "true"
            deprecation       = "false"
            includeantruntime = "true"
+           source            = "${target}"
+           target            = "${target}"
            classpath         = "../core/out"
            srcdir            = "src"
            destdir           = "out"

ant/gradle.properties

+# Gradle build properties for the ProGuard Ant task.
+
+target = 1.8

ant/pom.xml

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

ant/src/proguard/ant/ClassPathElement.java

@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2018 GuardSquare NV
+ * Copyright (c) 2002-2019 Guardsquare NV
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free

ant/src/proguard/ant/ClassSpecificationElement.java

@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2018 GuardSquare NV
+ * Copyright (c) 2002-2019 Guardsquare NV
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free

ant/src/proguard/ant/ConfigurationElement.java

@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2018 GuardSquare NV
+ * Copyright (c) 2002-2019 Guardsquare NV
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free

ant/src/proguard/ant/ConfigurationTask.java

@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2018 GuardSquare NV
+ * Copyright (c) 2002-2019 Guardsquare NV
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -73,6 +73,9 @@ public class ConfigurationTask extends Task
         configuration.assumeNoExternalReturnValues = extendClassSpecifications(configuration.assumeNoExternalReturnValues,
                                                                                this.configuration.assumeNoExternalReturnValues);
 
+        configuration.assumeValues                 = extendClassSpecifications(configuration.assumeValues,
+                                                                               this.configuration.assumeValues);
+
         configuration.keepPackageNames             = extendList(configuration.keepPackageNames,
                                                                 this.configuration.keepPackageNames);
 
@@ -234,6 +237,13 @@ public class ConfigurationTask extends Task
     }
 
 
+    public void addConfiguredAssumevalues(ClassSpecificationElement classSpecificationElement)
+    {
+        configuration.assumeValues = extendClassSpecifications(configuration.assumeValues,
+                                                               classSpecificationElement);
+    }
+
+
     public void addConfiguredOptimizations(FilterElement filterElement)
     {
         addConfiguredOptimization(filterElement);

ant/src/proguard/ant/FilterElement.java

@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2018 GuardSquare NV
+ * Copyright (c) 2002-2019 Guardsquare NV
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free

ant/src/proguard/ant/KeepSpecificationElement.java

@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2018 GuardSquare NV
+ * Copyright (c) 2002-2019 Guardsquare NV
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free

ant/src/proguard/ant/MemberSpecificationElement.java

@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2018 GuardSquare NV
+ * Copyright (c) 2002-2019 Guardsquare NV
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -22,7 +22,7 @@ package proguard.ant;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.DataType;
-import proguard.MemberSpecification;
+import proguard.*;
 import proguard.classfile.*;
 import proguard.classfile.util.ClassUtil;
 import proguard.util.ListUtil;
@@ -41,6 +41,7 @@ public class MemberSpecificationElement extends DataType
     private String type;
     private String name;
     private String parameters;
+    private String values;
 
 
     /**
@@ -69,6 +70,7 @@ public class MemberSpecificationElement extends DataType
         String annotation = memberSpecificationElement.annotation;
         String name       = memberSpecificationElement.name;
         String parameters = memberSpecificationElement.parameters;
+        String values     = memberSpecificationElement.values;
 
         // Perform some basic conversions and checks on the attributes.
         if (annotation != null)
@@ -90,6 +92,11 @@ public class MemberSpecificationElement extends DataType
                     type = JavaConstants.TYPE_VOID;
                 }
 
+                if (values != null)
+                {
+                    throw new BuildException("Values attribute not allowed in constructor specification ["+values+"]");
+                }
+
                 name = ClassConstants.METHOD_NAME_INIT;
             }
             else if ((type != null) ^ (parameters != null))
@@ -105,6 +112,14 @@ public class MemberSpecificationElement extends DataType
             }
         }
 
+        if (values != null)
+        {
+            if (type == null)
+            {
+                throw new BuildException("Values attribute must be specified in combination with type attribute in class member specification ["+values+"]");
+            }
+        }
+
         List parameterList = ListUtil.commaSeparatedList(parameters);
 
         String descriptor =
@@ -112,7 +127,15 @@ public class MemberSpecificationElement extends DataType
             type       != null ? ClassUtil.internalType(type)                            :
                                  null;
 
-        MemberSpecification memberSpecification =
+        MemberSpecification memberSpecification = values != null ?
+            new MemberValueSpecification(requiredAccessFlags(true, access),
+                                         requiredAccessFlags(false, access),
+                                         annotation,
+                                         name,
+                                         descriptor,
+                                         parseValues(type,
+                                                     ClassUtil.internalType(type),
+                                                     values)) :
             new MemberSpecification(requiredAccessFlags(true,  access),
                                     requiredAccessFlags(false, access),
                                     annotation,
@@ -165,6 +188,12 @@ public class MemberSpecificationElement extends DataType
     }
 
 
+    public void setValues(String values)
+    {
+        this.values = values;
+    }
+
+
     // Small utility methods.
 
     private int requiredAccessFlags(boolean set,
@@ -215,4 +244,98 @@ public class MemberSpecificationElement extends DataType
 
         return accessFlags;
     }
+
+
+    /**
+     * Parses the given string as a value or value range of the given primitive
+     * type. For example, values "123" or "100..199" of type "int" ("I").
+     */
+    private Number[] parseValues(String externalType,
+                                 String internalType,
+                                 String string)
+    throws BuildException
+    {
+        int rangeIndex = string.lastIndexOf("..");
+        return rangeIndex >= 0 ?
+            new Number[]
+            {
+                parseValue(externalType, internalType, string.substring(0, rangeIndex)),
+                parseValue(externalType, internalType, string.substring(rangeIndex + 2))
+            } :
+            new Number[]
+            {
+                parseValue(externalType, internalType, string)
+            };
+    }
+
+
+    /**
+     * Parses the given string as a value of the given primitive type.
+     * For example, value "123" of type "int" ("I").
+     * For example, value "true" of type "boolean" ("Z"), returned as 1.
+     */
+    private Number parseValue(String externalType,
+                              String internalType,
+                              String string)
+    throws BuildException
+    {
+        try
+        {
+            switch (internalType.charAt(0))
+            {
+                case ClassConstants.TYPE_BOOLEAN:
+                {
+                    return parseBoolean(string);
+                }
+                case ClassConstants.TYPE_BYTE:
+                case ClassConstants.TYPE_CHAR:
+                case ClassConstants.TYPE_SHORT:
+                case ClassConstants.TYPE_INT:
+                {
+                    return Integer.decode(string);
+                }
+                //case ClassConstants.TYPE_LONG:
+                //{
+                //    return Long.decode(string);
+                //}
+                //case ClassConstants.TYPE_FLOAT:
+                //{
+                //    return Float.valueOf(string);
+                //}
+                //case ClassConstants.TYPE_DOUBLE:
+                //{
+                //    return Double.valueOf(string);
+                //}
+                default:
+                {
+                    throw new BuildException("Can't handle '"+externalType+"' constant ["+string+"]");
+                }
+            }
+        }
+        catch (NumberFormatException e)
+        {
+            throw new BuildException("Can't parse "+externalType+" constant ["+string+"]");
+        }
+    }
+
+
+    /**
+     * Parses the given boolean string as an integer (0 or 1).
+     */
+    private Integer parseBoolean(String string)
+    throws BuildException
+    {
+        if      ("false".equals(string))
+        {
+            return Integer.valueOf(0);
+        }
+        else if ("true".equals(string))
+        {
+            return Integer.valueOf(1);
+        }
+        else
+        {
+            throw new BuildException("Unknown boolean constant ["+string+"]");
+        }
+    }
 }

ant/src/proguard/ant/ProGuardTask.java

@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2018 GuardSquare NV
+ * Copyright (c) 2002-2019 Guardsquare NV
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free

buildscripts/README

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