From 32a500ef2d960f43d2f5950d0402d58043984083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar?= <56847527+LikeTheSalad@users.noreply.github.com> Date: Wed, 29 May 2024 20:00:03 +0200 Subject: [PATCH] Ignoring duplicate non-class files (#1654) --- .../service-implementation-lib/src/main/resources/LICENSE | 1 + .../service-implementation-lib/src/main/resources/LICENSE.txt | 1 + .../service-implementation-lib/src/main/resources/NOTICE | 1 + .../service-implementation-lib/src/main/resources/NOTICE.txt | 1 + .../service-implementation2-lib/src/main/resources/LICENSE | 1 + .../service-implementation2-lib/src/main/resources/LICENSE.txt | 1 + .../service-implementation2-lib/src/main/resources/NOTICE | 1 + .../service-implementation2-lib/src/main/resources/NOTICE.txt | 1 + .../build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java | 2 +- 9 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/LICENSE create mode 100644 byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/LICENSE.txt create mode 100644 byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/NOTICE create mode 100644 byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/NOTICE.txt create mode 100644 byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/LICENSE create mode 100644 byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/LICENSE.txt create mode 100644 byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/NOTICE create mode 100644 byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/NOTICE.txt 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 new file mode 100644 index 00000000000..eea236faace --- /dev/null +++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/LICENSE @@ -0,0 +1 @@ +A license \ No newline at end of file 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 new file mode 100644 index 00000000000..eea236faace --- /dev/null +++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/LICENSE.txt @@ -0,0 +1 @@ +A license \ No newline at end of file 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 new file mode 100644 index 00000000000..d46cbca1dc7 --- /dev/null +++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/NOTICE @@ -0,0 +1 @@ +A notice \ No newline at end of file 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 new file mode 100644 index 00000000000..d46cbca1dc7 --- /dev/null +++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/NOTICE.txt @@ -0,0 +1 @@ +A notice \ No newline at end of file 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 new file mode 100644 index 00000000000..eea236faace --- /dev/null +++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/LICENSE @@ -0,0 +1 @@ +A license \ No newline at end of file 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 new file mode 100644 index 00000000000..eea236faace --- /dev/null +++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/LICENSE.txt @@ -0,0 +1 @@ +A license \ No newline at end of file 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 new file mode 100644 index 00000000000..d46cbca1dc7 --- /dev/null +++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/NOTICE @@ -0,0 +1 @@ +A notice \ No newline at end of file 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 new file mode 100644 index 00000000000..d46cbca1dc7 --- /dev/null +++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/NOTICE.txt @@ -0,0 +1 @@ +A notice \ No newline at end of file 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 index 977a3250c0a..733dcfd9c7e 100644 --- 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; } }