commit 2fe3fcb0dc21ed70eb37cc74aae247deffc90d29
author Søren Gjesse <sgjesse@google.com> Fri Jan 25 09:12:36 2019 +0100
committer Søren Gjesse <sgjesse@google.com> Fri Jan 25 09:12:36 2019 +0100
tree ceb31898999fe592b1a34b883de0e643413e879f
parent 8fc0b4748a36f62c6c29baeee00d5a9fd08451e0

Version 1.4.30


Cherry-pick: Don't include kotlin module files in distribution.
CL: https://r8-review.googlesource.com/c/r8/+/33381

Bug: 123310328
Change-Id: I92dce45d6c031f2dd58780b0278a188142b21523

build.gradle

diff --git a/build.gradle b/build.gradle
index 7ff46eb..308914a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -567,6 +567,7 @@
     from repackageSources.outputs.files
     from repackageDeps.outputs.files
     configureRelocations(it)
+    exclude "META-INF/*.kotlin_module"
 }
 
 task r8WithoutDeps(type: ShadowJar) {
@@ -596,6 +597,7 @@
     } else {
         from sourceSets.main.output
     }
+    exclude "META-INF/*.kotlin_module"
 }
 
 task R8NoManifestNoDeps(type: ShadowJar) {
@@ -619,6 +621,7 @@
     } else {
         from sourceSets.main.output
     }
+    exclude "META-INF/*.kotlin_module"
 }
 
 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 a7b396e..115fe4a 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.4.29";
+  public static final String LABEL = "1.4.30";
 
   private Version() {
   }