Bump to version 7.0.1

Add release note for Kotlin 1.4 metadata fix

README.md

@@ -68,51 +68,61 @@ The resulting applications and libraries are smaller, faster, and a bit better
 hardened against reverse engineering. ProGuard is very popular for Android
 development, but it also works for Java code in general.
 
+## ❓ Getting Help
+If you have **usage or general questions** please ask them in the <a href="https://community.guardsquare.com/?utm_source=github&utm_medium=site-link&utm_campaign=github-community">**Guardsquare Community**.</a>  
+Please use <a href="https://github.com/guardsquare/proguard/issues">**the issue tracker**</a> to report actual **bugs 🐛, crashes**, etc.
+<br />
+<br />
+
 ## 🚀 Quick Start
 
 ProGuard is integrated in Google's Android SDK. If you have an Android Gradle
 project you can enable ProGuard instead of the default R8 compiler:
 
 1. Disable R8 in your `gradle.properties`:
-    ```
-    android.enableR8=false
-    android.enableR8.libraries=false
-    ```
+
+```gradle
+android.enableR8=false
+android.enableR8.libraries=false
+```
 
 2. Override the default version of ProGuard with the most recent one in your
    main `build.gradle`:
-    ```
-    buildscript {
-        ...
-        configurations.all {
-            resolutionStrategy {
-                dependencySubstitution {
-                    substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.0')
-                }
+
+```gradle
+buildscript {
+    //...
+    configurations.all {
+        resolutionStrategy {
+            dependencySubstitution {
+                substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.1')
             }
         }
     }
-    ```
+}
+```
 
 3. Enable minification as usual in your `build.gradle`:
-    ```
-    android {
-        ...
-        buildTypes {
-            release {
-                minifyEnabled   true
-                shrinkResources true
-                proguardFile getDefaultProguardFile('proguard-android-optimize.txt')
-                proguardFile 'proguard-project.txt'
-            }
+
+```gradle
+android {
+    //...
+    buildTypes {
+        release {
+            minifyEnabled   true
+            shrinkResources true
+            proguardFile getDefaultProguardFile('proguard-android-optimize.txt')
+            proguardFile 'proguard-project.txt'
         }
     }
-    ```
+}
+```
 
 4. Add any necessary configuration to your `proguard-project.txt`.
 
 You can then build your application as usual:
-```
+
+```shell
 gradle assembleRelease
 ```
 

base/build.gradle

@@ -28,7 +28,7 @@ sourceSets.main {
 }
 
 dependencies {
-    compile 'com.guardsquare:proguard-core:7.0.0'
+    compile "com.guardsquare:proguard-core:${proguardCoreVersion}"
     compile "com.google.code.gson:gson:${gsonVersion}"
 }
 

base/src/proguard/obfuscate/AttributeShrinker.java

@@ -22,7 +22,7 @@ package proguard.obfuscate;
 
 import proguard.classfile.*;
 import proguard.classfile.attribute.*;
-import proguard.classfile.attribute.visitor.*;
+import proguard.classfile.attribute.visitor.AttributeVisitor;
 import proguard.classfile.visitor.*;
 import proguard.util.Processable;
 
@@ -39,8 +39,7 @@ import java.util.Arrays;
 public class AttributeShrinker
 implements   ClassVisitor,
              MemberVisitor,
-             AttributeVisitor,
-             RecordComponentInfoVisitor
+             AttributeVisitor
 {
     // Implementations for ClassVisitor.
 
@@ -84,13 +83,6 @@ implements   ClassVisitor,
     public void visitAnyAttribute(Clazz clazz, Attribute attribute) {}
 
 
-    public void visitRecordAttribute(Clazz clazz, RecordAttribute recordAttribute)
-    {
-        // Compact any attributes of the components.
-        recordAttribute.componentsAccept(clazz, this);
-    }
-
-
     public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute)
     {
         // Compact the attributes array.
@@ -100,17 +92,6 @@ implements   ClassVisitor,
     }
 
 
-    // Implementations for RecordComponentInfoVisitor.
-
-    public void visitRecordComponentInfo(Clazz clazz, RecordComponentInfo recordComponentInfo)
-    {
-        // Compact the attributes array.
-        recordComponentInfo.u2attributesCount =
-            shrinkArray(recordComponentInfo.attributes,
-                        recordComponentInfo.u2attributesCount);
-    }
-
-
     // Small utility methods.
 
     /**

base/src/proguard/obfuscate/MemberNameCollector.java

@@ -92,9 +92,8 @@ implements   MemberVisitor
             // Isn't there another original name for this new name, or should
             // this original name get priority?
             String otherName = (String)nameMap.get(newName);
-            if (otherName == null                              ||
-                MemberObfuscator.hasFixedNewMemberName(member) ||
-                name.compareTo(otherName) < 0)
+            if (otherName == null ||
+                MemberObfuscator.hasFixedNewMemberName(member))
             {
                 // Remember not to use the new name again in this name space.
                 nameMap.put(newName, name);

base/src/proguard/optimize/peephole/TargetClassChanger.java

@@ -44,12 +44,9 @@ import proguard.util.ArrayUtil;
  */
 public class TargetClassChanger
 implements   ClassVisitor,
-
-             // Implementation interfaces.
              ConstantVisitor,
              MemberVisitor,
              AttributeVisitor,
-             RecordComponentInfoVisitor,
              LocalVariableInfoVisitor,
              LocalVariableTypeInfoVisitor,
              AnnotationVisitor,
@@ -308,13 +305,6 @@ implements   ClassVisitor,
     public void visitAnyAttribute(Clazz clazz, Attribute attribute) {}
 
 
-    public void visitRecordAttribute(Clazz clazz, RecordAttribute recordAttribute)
-    {
-        // Fix the record component attributes.
-        recordAttribute.componentsAccept(clazz, this);
-    }
-
-
     public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute)
     {
         // Change the references of the attributes.
@@ -364,18 +354,6 @@ implements   ClassVisitor,
     }
 
 
-    // Implementations for RecordComponentInfoVisitor.
-
-    public void visitRecordComponentInfo(Clazz clazz, RecordComponentInfo recordComponentInfo)
-    {
-        // Don't change the referenced field; it's still the original one
-        // in this class.
-
-        // Change the references of the attributes.
-        recordComponentInfo.attributesAccept(clazz, this);
-    }
-
-
     // Implementations for LocalVariableInfoVisitor.
 
     public void visitLocalVariableInfo(Clazz clazz, Method method, CodeAttribute codeAttribute, LocalVariableInfo localVariableInfo)

base/src/proguard/shrink/ClassShrinker.java

@@ -46,7 +46,6 @@ public class ClassShrinker
 implements   ClassVisitor,
              MemberVisitor,
              AttributeVisitor,
-             RecordComponentInfoVisitor,
              AnnotationVisitor,
              ElementValueVisitor
 {
@@ -234,18 +233,6 @@ implements   ClassVisitor,
     }
 
 
-    public void visitRecordAttribute(Clazz clazz, RecordAttribute recordAttribute)
-    {
-        // Shrink the array of RecordComponentInfo objects.
-        recordAttribute.u2componentsCount =
-            shrinkArray(recordAttribute.components,
-                        recordAttribute.u2componentsCount);
-
-        // Shrink the attributes of the remaining components.
-        recordAttribute.componentsAccept(clazz, this);
-    }
-
-
     public void visitInnerClassesAttribute(Clazz clazz, InnerClassesAttribute innerClassesAttribute)
     {
         // Shrink the array of InnerClassesInfo objects.
@@ -331,20 +318,6 @@ implements   ClassVisitor,
     }
 
 
-    // Implementations for RecordComponentInfoVisitor.
-
-    public void visitRecordComponentInfo(Clazz clazz, RecordComponentInfo recordComponentInfo)
-    {
-        // Shrink the attributes array.
-        recordComponentInfo.u2attributesCount =
-            shrinkArray(recordComponentInfo.attributes,
-                        recordComponentInfo.u2attributesCount);
-
-        // Shrink the remaining attributes.
-        recordComponentInfo.attributesAccept(clazz, this);
-    }
-
-
     // Implementations for AnnotationVisitor.
 
     public void visitAnnotation(Clazz clazz, Annotation annotation)

base/src/proguard/shrink/ClassUsageMarker.java

@@ -857,6 +857,15 @@ implements   ClassVisitor,
     }
 
 
+    public void visitSourceDebugExtensionAttribute(Clazz clazz,
+                                                   SourceDebugExtensionAttribute sourceDebugExtensionAttribute)
+    {
+        markAsUsed(sourceDebugExtensionAttribute);
+
+        markConstant(clazz, sourceDebugExtensionAttribute.u2attributeNameIndex);
+    }
+
+
     public void visitBootstrapMethodsAttribute(Clazz clazz, BootstrapMethodsAttribute bootstrapMethodsAttribute)
     {
         // Don't mark the attribute and its name here. We may mark it in
@@ -882,26 +891,6 @@ implements   ClassVisitor,
     }
 
 
-    public void visitSourceDebugExtensionAttribute(Clazz clazz, SourceDebugExtensionAttribute sourceDebugExtensionAttribute)
-    {
-        markAsUsed(sourceDebugExtensionAttribute);
-
-        markConstant(clazz, sourceDebugExtensionAttribute.u2attributeNameIndex);
-    }
-
-
-    public void visitRecordAttribute(Clazz clazz, RecordAttribute recordAttribute)
-    {
-        markAsUsed(recordAttribute);
-
-        markConstant(clazz, recordAttribute.u2attributeNameIndex);
-
-        // Don't mark the components yet. We may mark them later, in
-        // RecordComponentUsageMarker.
-        //recordAttribute.componentsAccept(clazz, this);
-    }
-
-
     public void visitInnerClassesAttribute(Clazz clazz, InnerClassesAttribute innerClassesAttribute)
     {
         // Don't mark the attribute and its name yet. We may mark it later, in

base/src/proguard/shrink/RecordComponentUsageMarker.java

@@ -1,108 +0,0 @@
-/*
- * ProGuard -- shrinking, optimization, obfuscation, and preverification
- *             of Java bytecode.
- *
- * Copyright (c) 2002-2020 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
- */
-package proguard.shrink;
-
-import proguard.classfile.*;
-import proguard.classfile.attribute.*;
-import proguard.classfile.attribute.visitor.*;
-import proguard.classfile.constant.*;
-import proguard.classfile.constant.visitor.ConstantVisitor;
-import proguard.classfile.visitor.*;
-
-/**
- * This RecordComponentInfoVisitor marks all record components that
- * it visits and whose corresponding fields have been marked before.
- *
- * @see ClassUsageMarker
- *
- * @author Eric Lafortune
- */
-public class RecordComponentUsageMarker
-implements   RecordComponentInfoVisitor,
-             MemberVisitor,
-             ConstantVisitor
-{
-    private final ClassUsageMarker classUsageMarker;
-
-    // Field acting as a return parameter.
-    private boolean fieldUsed;
-
-
-    /**
-     * Creates a new InnerUsageMarker.
-     * @param classUsageMarker the marker to mark and check the classes and
-     *                         class members.
-     */
-    public RecordComponentUsageMarker(ClassUsageMarker classUsageMarker)
-    {
-        this.classUsageMarker = classUsageMarker;
-    }
-
-
-    // Implementations for RecordComponentInfoVisitor.
-
-    public void visitRecordComponentInfo(Clazz clazz, RecordComponentInfo recordComponentInfo)
-    {
-        // Is the field that corresponds to the component used?
-        fieldUsed = false;
-        recordComponentInfo.referencedFieldAccept(clazz, this);
-        if (fieldUsed)
-        {
-            // Mark the component.
-            classUsageMarker.markAsUsed(recordComponentInfo);
-
-            // Mark its name and descriptor.
-            markConstant(clazz, recordComponentInfo.u2nameIndex);
-            markConstant(clazz, recordComponentInfo.u2descriptorIndex);
-
-            // Mark its attributes.
-            recordComponentInfo.attributesAccept(clazz, classUsageMarker);
-        }
-    }
-
-
-    // Implementations for MemberVisitor.
-
-    public void visitProgramField(ProgramClass programClass, ProgramField programField)
-    {
-        fieldUsed = classUsageMarker.isUsed(programField);
-    }
-
-
-    // Implementations for ConstantVisitor.
-
-    public void visitUtf8Constant(Clazz clazz, Utf8Constant utf8Constant)
-    {
-        classUsageMarker.markAsUsed(utf8Constant);
-    }
-
-
-    // Small utility methods.
-
-    /**
-     * Marks the given constant pool entry of the given class. This includes
-     * visiting any other referenced constant pool entries.
-     */
-    private void markConstant(Clazz clazz, int index)
-    {
-         clazz.constantPoolEntryAccept(index, this);
-    }
-}

base/src/proguard/shrink/UsageMarker.java

@@ -138,12 +138,6 @@ public class UsageMarker
                 new KotlinModuleUsageMarker(simpleUsageMarker))));
         }
 
-        // Mark the record metadata.
-        programClassPool.classesAccept(
-            new AllAttributeVisitor(
-            new AllRecordComponentInfoVisitor(
-            new RecordComponentUsageMarker(classUsageMarker))));
-
         // Check if the Gson optimization is enabled.
         StringMatcher filter = configuration.optimizations != null ?
             new ListParser(new NameParser()).parse(configuration.optimizations) :

build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = 'com.guardsquare'
-    version = '7.0.0'
+    version = proguardVersion
 }
 
 wrapper {

docs/md/manual/attributes.md

@@ -47,10 +47,6 @@ attributes. You can keep them with the
 : Specifies the name of the source directory from which the class file was
   compiled.
 
-`Record`
-: Specifies the components of a record class. Code may access this information
-  by reflection.
-
 `InnerClasses`
 : Specifies the relationship between a class and its inner classes and outer
   classes. Other than this and the naming convention with a '\$' separator
@@ -139,7 +135,7 @@ ProGuard automatically keeps the following essential attributes, processing
 them as necessary. We're listing them for the sake of completeness:
 
 `ConstantValue`
-: Specifies a constant integer, float, class, string, etc.
+: Specifies a constant integer, float, class, string, etc.  
 
 `Code`
 : Specifies the actual bytecode of a method.

docs/md/manual/gradle.md

@@ -10,7 +10,7 @@ line to your **`build.gradle`** file:
             jcenter()
         }
         dependencies {
-            classpath 'com.guardsquare:proguard-gradle:7.0.0'
+            classpath 'com.guardsquare:proguard-gradle:7.0.1'
         }
     }
 

docs/md/manual/gradleplugin.md

@@ -14,7 +14,7 @@ project you can enable ProGuard instead of the default R8 compiler:
             configurations.all {
                 resolutionStrategy {
                     dependencySubstitution {
-                        substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.0')
+                        substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.1')
                     }
                 }
             }
@@ -58,7 +58,7 @@ project as follows:
         }
         dependencies {
             classpath 'com.android.tools.build:gradle:3.3.0'
-            classpath 'com.guardsquare:proguard-gradle:7.0.0'
+            classpath 'com.guardsquare:proguard-gradle:7.0.1'
         }
     }
 

docs/md/releasenotes.md

@@ -1,16 +1,9 @@
-## Version 7.1
-
-| Version| Issue    | Module   | Explanation
-|--------|----------|----------|----------------------------------
-| 7.1.x  | PGD-0064 | CORE     | Added support for Java 14 and 15.
-| 7.1.x  | PGD-0064 | CORE     | Added support for record attributes.
-| 7.1.x  | DGD-2390 | CORE     | Fixed storage and alignment of uncompressed zip entries.
-| 7.1.x  | DGD-2338 | CORE     | Fixed processing of constant boolean arrays.
-
 ## Version 7.0 (Jun 2020)
 
 | Version| Issue    | Module   | Explanation
 |--------|----------|----------|----------------------------------
+| 7.0.1  | DGD-2382 | CORE     | Fixed processing of Kotlin 1.4 metadata annotations.
+| 7.0.1  | DGD-2494 | CORE     | Fix naming conflict resolution potentially resulting in the renaming of library members.
 | 7.0.1  |          | RETRACE  | Extend expressions supported by Retrace.
 | 7.0.0  |          | CORE     | Added support for [Kotlin metadata](manual/kotlin.md), with new option `-keepkotlinmetadata`.
 | 7.0.0  | PGD-32   | CORE     | Allowing Java 14 class files.

examples/android-plugin/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         //classpath ':proguard:'    // For the local copy of the ProGuard plugin.
-        classpath 'com.guardsquare:proguard-gradle:7.0.0' // For the copy from Jcenter.
+        classpath 'com.guardsquare:proguard-gradle:7.0.1' // For the copy from Jcenter.
         classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }

examples/android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
             // Override the default version of ProGuard
             // with the most recent one.
             dependencySubstitution {
-                substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.0')
+                substitute module('net.sf.proguard:proguard-gradle') with module('com.guardsquare:proguard-gradle:7.0.1')
             }
         }
     }

examples/gradle/android.gradle

@@ -20,7 +20,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/applets.gradle

@@ -13,7 +13,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/applications.gradle

@@ -13,7 +13,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/library.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/midlets.gradle

@@ -13,7 +13,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/proguard.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/proguardgui.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/retrace.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/scala.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradle/servlets.gradle

@@ -13,7 +13,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.0.0'
+        classpath 'com.guardsquare:proguard-gradle:7.0.1'
     }
 }
 

examples/gradlekotlindsl/.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

examples/gradlekotlindsl/.gitignore

@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build

examples/gradlekotlindsl/build.gradle.kts

@@ -0,0 +1,76 @@
+buildscript {
+    repositories {
+        jcenter()
+        google()
+    }
+    dependencies {
+        // TODO: required due to https://github.com/Guardsquare/proguard/issues/30
+        classpath("com.android.tools.build:gradle:3.0.0")
+
+        classpath("com.guardsquare:proguard-gradle:7.0.1")
+    }
+}
+
+plugins {
+    java
+    application
+}
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    testImplementation("junit:junit:4.12")
+}
+
+application {
+    mainClassName = "gradlekotlindsl.App"
+}
+
+
+tasks.withType<Jar> {
+    manifest {
+        attributes["Main-Class"] = application.mainClassName
+    }
+}
+
+tasks.register<proguard.gradle.ProGuardTask>("proguard") {
+    dependsOn("jar")
+
+    // Alternatively put your config in a separate file
+    // configuration("config.pro")
+
+    verbose()
+
+    injars("build/libs/gradlekotlindsl.jar")
+
+    outjars("build/libs/gradlekotlindsl-obfuscated.jar")
+
+    val javaHome = System.getProperty("java.home")
+    // Automatically handle the Java version of this build.
+    if (System.getProperty("java.version").startsWith("1.")) {
+        // Before Java 9, the runtime classes were packaged in a single jar file.
+        libraryjars("$javaHome/lib/rt.jar")
+    } else {
+        // As of Java 9, the runtime classes are packaged in modular jmod files.
+        libraryjars(
+            // filters must be specified first, as a map
+            mapOf("jarfilter" to "!**.jar",
+                  "filter"    to "!module-info.class"),
+            "$javaHome/jmods/java.base.jmod"
+        )
+    }
+
+    allowaccessmodification()
+
+    repackageclasses("")
+
+    printmapping("build/mapping.txt")
+
+    keep("""class gradlekotlindsl.App {
+                public static void main(java.lang.String[]);
+            }
+    """)
+}
+

examples/gradlekotlindsl/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

examples/gradlekotlindsl/gradlew

@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

examples/gradlekotlindsl/gradlew.bat

@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

examples/gradlekotlindsl/settings.gradle.kts

@@ -0,0 +1,10 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user manual at https://docs.gradle.org/6.1.1/userguide/multi_project_builds.html
+ */
+
+rootProject.name = "gradlekotlindsl"

examples/gradlekotlindsl/src/main/java/gradlekotlindsl/App.java

@@ -0,0 +1,14 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package gradlekotlindsl;
+
+public class App {
+    public String getGreeting() {
+        return "Hello world.";
+    }
+
+    public static void main(String[] args) {
+        System.out.println(new App().getGreeting());
+    }
+}

examples/gradlekotlindsl/src/test/java/gradlekotlindsl/AppTest.java

@@ -0,0 +1,14 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package gradlekotlindsl;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class AppTest {
+    @Test public void testAppHasAGreeting() {
+        App classUnderTest = new App();
+        assertNotNull("app should have a greeting", classUnderTest.getGreeting());
+    }
+}

gradle.properties

@@ -1,11 +1,8 @@
+proguardVersion = 7.0.1
+proguardCoreVersion = 7.0.1
 gsonVersion = 2.8.5
 kotlinVersion = 1.3.31
 kotlinxMetadataVersion = 0.1.0
 target = 1.8
-
-# Optionally compile the WTK plugin.
 wtkDir = /usr/local/java/wtk2.1
-wtkHome = /usr/local/java/wtk
-
-# Optionally set up a composite build with ProGuardCORE.
-#proguardCoreDir = ../proguard-core
+wtkHome = /usr/local/java/wtk

settings.gradle

@@ -11,11 +11,6 @@ pluginManagement {
     }
 }
 
-if (hasProperty('proguardCoreDir'))
-{
-    includeBuild proguardCoreDir
-}
-
 rootProject.name = 'parent'
 
 include 'base'