Adjust defaults for class file version use in build plugins.

Author: raphw

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

@@ -481,8 +481,8 @@ public static void apply(Logger logger,
             classFileLocators.add(rootLocator);
             for (File artifact : artifacts) {
                 classFileLocators.add(artifact.isFile()
-                        ? ClassFileLocator.ForJarFile.of(artifact)
-                        : new ClassFileLocator.ForFolder(artifact));
+                        ? ClassFileLocator.ForJarFile.of(artifact, classFileVersion)
+                        : ClassFileLocator.ForFolder.of(artifact, classFileVersion));
             }
             ClassFileLocator classFileLocator = new ClassFileLocator.Compound(classFileLocators);
             try {
@@ -493,6 +493,7 @@ public static void apply(Logger logger,
                                 ? Plugin.Engine.PoolStrategy.Default.EXTENDED
                                 : Plugin.Engine.PoolStrategy.Default.FAST)
                         .with(classFileLocator)
+                        .with(classFileVersion)
                         .with(new TransformationLogger(logger))
                         .withErrorHandlers(Plugin.Engine.ErrorHandler.Enforcing.ALL_TYPES_RESOLVED, failOnLiveInitializer
                                 ? Plugin.Engine.ErrorHandler.Enforcing.NO_LIVE_INITIALIZERS

byte-buddy-maven-plugin/src/main/java/net/bytebuddy/build/maven/ByteBuddyMojo.java

@@ -405,30 +405,32 @@ protected Plugin.Engine.Summary transform(List<? extends String> classPath,
             String managed = coordinates.get(new Coordinate(project.getGroupId(), project.getArtifactId()));
             EntryPoint entryPoint = (initialization == null ? new Initialization() : initialization).getEntryPoint(classLoaderResolver, project.getGroupId(), project.getArtifactId(), managed == null ? project.getVersion() : managed, project.getPackaging());
             getLog().info("Resolved entry point: " + entryPoint);
+            String javaVersionString = findJavaVersionString(project, "release");
+            if (javaVersionString == null) {
+                javaVersionString = findJavaVersionString(project, "target");
+            }
+            ClassFileVersion classFileVersion;
+            if (javaVersionString == null) {
+                classFileVersion = ClassFileVersion.ofThisVm(ClassFileVersion.JAVA_V5);
+                getLog().warn("Could not locate Java target version, build is JDK dependant: " + classFileVersion.getMajorVersion());
+            } else {
+                classFileVersion = ClassFileVersion.ofJavaVersionString(javaVersionString);
+                getLog().debug("Java version detected: " + javaVersionString);
+            }
             List<ClassFileLocator> classFileLocators = new ArrayList<ClassFileLocator>(classPath.size());
             classFileLocators.add(ClassFileLocator.ForClassLoader.ofPlatformLoader());
             for (String element : classPath) {
                 File artifact = new File(element);
-                classFileLocators.add(artifact.isFile() ? ClassFileLocator.ForJarFile.of(artifact) : new ClassFileLocator.ForFolder(artifact));
+                classFileLocators.add(artifact.isFile()
+                        ? ClassFileLocator.ForJarFile.of(artifact, classFileVersion)
+                        : ClassFileLocator.ForFolder.of(artifact, classFileVersion));
             }
             ClassFileLocator classFileLocator = new ClassFileLocator.Compound(classFileLocators);
             Plugin.Engine.Summary summary;
             try {
                 getLog().info("Processing class files located in in: " + file);
                 Plugin.Engine pluginEngine;
                 try {
-                    String javaVersionString = findJavaVersionString(project, "release");
-                    if (javaVersionString == null) {
-                        javaVersionString = findJavaVersionString(project, "target");
-                    }
-                    ClassFileVersion classFileVersion;
-                    if (javaVersionString == null) {
-                        classFileVersion = ClassFileVersion.ofThisVm(ClassFileVersion.JAVA_V5);
-                        getLog().warn("Could not locate Java target version, build is JDK dependant: " + classFileVersion.getMajorVersion());
-                    } else {
-                        classFileVersion = ClassFileVersion.ofJavaVersionString(javaVersionString);
-                        getLog().debug("Java version detected: " + javaVersionString);
-                    }
                     pluginEngine = Plugin.Engine.Default.of(entryPoint,
                             classFileVersion,
                             suffix == null || suffix.length() == 0 ? MethodNameTransformer.Suffixing.withRandomSuffix() : new MethodNameTransformer.Suffixing(suffix));
@@ -439,6 +441,7 @@ protected Plugin.Engine.Summary transform(List<? extends String> classPath,
                     summary = pluginEngine
                             .with(extendedParsing ? Plugin.Engine.PoolStrategy.Default.EXTENDED : Plugin.Engine.PoolStrategy.Default.FAST)
                             .with(classFileLocator)
+                            .with(classFileVersion)
                             .with(new TransformationLogger(getLog()))
                             .withErrorHandlers(Plugin.Engine.ErrorHandler.Enforcing.ALL_TYPES_RESOLVED,
                                     failOnLiveInitializer ? Plugin.Engine.ErrorHandler.Enforcing.NO_LIVE_INITIALIZERS : Plugin.Engine.Listener.NoOp.INSTANCE,