Validate info classes (#1557)

* Updating tests to replicate duplicated module-info.class issue

* Adding class headers

* Ignoring duplicated "*-info.class" files

byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/build.gradle

@@ -18,7 +18,7 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
     }
 }

byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/build.gradle

@@ -18,8 +18,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
     }
 }
 

byte-buddy-gradle-plugin/android-plugin-test/app/build.gradle

@@ -21,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
     }
 }
 

byte-buddy-gradle-plugin/android-plugin-test/build.gradle

@@ -16,6 +16,8 @@ buildscript {
     }
 }
 
+ext.javaVersion = JavaVersion.VERSION_11
+
 subprojects {
     repositories {
         mavenCentral()

byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/build.gradle

@@ -4,6 +4,6 @@ plugins {
 apply from: "$rootDir/bytebuddy.gradle"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
 }

byte-buddy-gradle-plugin/android-plugin-test/service-definition-lib/build.gradle

@@ -3,6 +3,6 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
 }

byte-buddy-gradle-plugin/android-plugin-test/service-definition-lib/src/main/java/module-info.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module serviceDefinitionModule {
+    exports com.service.definition;
+}

byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/build.gradle

@@ -3,8 +3,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
 }
 
 dependencies {

byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/java/module-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module serviceImplModule {
+    exports com.service.usage;
+    requires serviceDefinitionModule;
+}

byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/build.gradle

@@ -3,8 +3,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
 }
 
 dependencies {

byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/java/module-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module serviceImpl2Module {
+    exports com.service.usage2;
+    requires serviceDefinitionModule;
+}

byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java

@@ -377,7 +377,8 @@ public void retain(Plugin.Engine.Source.Element element) throws IOException {
                     }
                     outputStream.closeEntry();
                 } catch (ZipException exception) {
-                    if (!element.getName().startsWith("META-INF")) {
+                    String name = element.getName();
+                    if (!name.startsWith("META-INF") && !name.endsWith("-info.class")) {
                         throw exception;
                     }
                 }