Ignoring duplicate non-class files (#1654)

LikeTheSalad · web-flow · commit 32a500ef2d96 · 2024-05-29T20:00:03.000+02:00
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/LICENSE b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/LICENSE
@@ -0,0 +1 @@
+A license
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/LICENSE.txt b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/LICENSE.txt
@@ -0,0 +1 @@
+A license
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/NOTICE b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/NOTICE
@@ -0,0 +1 @@
+A notice
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/NOTICE.txt b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/NOTICE.txt
@@ -0,0 +1 @@
+A notice
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/LICENSE b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/LICENSE
@@ -0,0 +1 @@
+A license
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/LICENSE.txt b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/LICENSE.txt
@@ -0,0 +1 @@
+A license
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/NOTICE b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/NOTICE
@@ -0,0 +1 @@
+A notice
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/NOTICE.txt b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/NOTICE.txt
@@ -0,0 +1 @@
+A notice
diff --git a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java
@@ -378,7 +378,7 @@ public void retain(Plugin.Engine.Source.Element element) throws IOException {
                     outputStream.closeEntry();
                 } catch (ZipException exception) {
                     String name = element.getName();
-                    if (!name.startsWith("META-INF") && !name.endsWith("-info.class")) {
+                    if (!name.startsWith("META-INF") && !name.endsWith("-info.class") && name.endsWith(".class")) {
                         throw exception;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ public void retain(Plugin.Engine.Source.Element element) throws IOException {`
`378`	`378`	`outputStream.closeEntry();`
`379`	`379`	`} catch (ZipException exception) {`
`380`	`380`	`String name = element.getName();`
`381`		`- if (!name.startsWith("META-INF") && !name.endsWith("-info.class")) {`
	`381`	`+ if (!name.startsWith("META-INF") && !name.endsWith("-info.class") && name.endsWith(".class")) {`
`382`	`382`	`throw exception;`
`383`	`383`	`}`
`384`	`384`	`}`