commit 82ce2240b83688d8ecdd69cb33cfe6e61b4df057
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Apr 14 17:08:14 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Apr 15 06:11:34 2021 +0000
tree 101dffa7cc76a69136eb73757fa1bf4259f073c9
parent 3568dcdd61aa8e3e71595073484694a9b540eff2

Ensure module-info.class is removed from deps in R8

Bug: 185317811
Change-Id: I9fbc14bd3892f6f8e9ed5045dc8466e17986015a

build.gradle

diff --git a/build.gradle b/build.gradle
index 12efa84..4feb96d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -733,7 +733,7 @@
 task repackageDepsNew(type: ShadowJar) {
     configurations = [project.configurations.runtimeClasspath]
     mergeServiceFiles(it)
-    exclude { it.getRelativePath().getPathString() == "module-info.class" }
+    exclude { it.getRelativePath().getPathString().endsWith("module-info.class") }
     exclude { it.getRelativePath().getPathString().startsWith("META-INF/maven/") }
     baseName 'deps_all'
 }