commit 88a24e874de32eda0755bf0de21394bf7c89746b
author Søren Gjesse <sgjesse@google.com> Wed Jul 03 17:27:55 2019 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Jul 03 17:27:55 2019 +0200
tree e54870f670049370694ba199f61a634b2c5d129b
parent 93221b04c9c33dc8d7fd19507ddf0286086e6050

Version 1.5.56

Cherry-pick: Don't include any files with extension .kotlin_metadata in R8 jars
CL: https://r8-review.googlesource.com/c/r8/+/40304

Resolved merge conflicts related to JDK 11 support not present in the 1.5 branch.

Bug: 136636007
Change-Id: I2d405ef0166495b3628716ce5f429092f4abc7cb

build.gradle

diff --git a/build.gradle b/build.gradle
index f9e5f2d..dbdcca0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -673,6 +673,7 @@
     from repackageDeps.outputs.files
     configureRelocations(it)
     exclude "META-INF/*.kotlin_module"
+    exclude "**/*.kotlin_metadata"
 }
 
 task r8WithoutDeps(type: ShadowJar) {
@@ -703,6 +704,7 @@
         from sourceSets.main.output
     }
     exclude "META-INF/*.kotlin_module"
+    exclude "**/*.kotlin_metadata"
 }
 
 task R8NoManifestNoDeps(type: ShadowJar) {
@@ -727,6 +729,7 @@
         from sourceSets.main.output
     }
     exclude "META-INF/*.kotlin_module"
+    exclude "**/*.kotlin_metadata"
 }
 
 task D8(type: ShadowJar) {

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 872f8cd..66708d9 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "1.5.55";
+  public static final String LABEL = "1.5.56";
 
   private Version() {
   }