commit b816a11cb21227e4703d7604f7b482e73cebcb64
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Apr 15 20:02:38 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Apr 15 20:02:38 2021 +0200
tree fc75b02f07ee677dc64b9d0b436cbfdd2590ac96
parent 5671daaa441cce336dc363b3f825c6a7f48906da

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 685122f..9e1bf0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -707,7 +707,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'
 }