Correct class loading and use maybe create for configuration.

raphw · raphw · commit 5ffe97cd98d4 · 2023-01-03T22:39:25.000+01:00
diff --git a/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTask.java b/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTask.java
@@ -385,7 +385,7 @@ protected void doApply(Plugin.Engine.Source source, Plugin.Engine.Target target)
                     if (undiscoverable.add(name)) {
                         try {
                             @SuppressWarnings("unchecked")
-                            Class<? extends Plugin> plugin = (Class<? extends Plugin>) Class.forName(name);
+                            Class<? extends Plugin> plugin = (Class<? extends Plugin>) Class.forName(name, false, classLoader);
                             Transformation transformation = new Transformation();
                             transformation.setPlugin(plugin);
                             transformations.add(transformation);
diff --git a/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/ByteBuddyPlugin.java b/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/ByteBuddyPlugin.java
@@ -112,7 +112,7 @@ public void execute(JavaPlugin plugin) {
                         extension = DISPATCHER.toExtension(project);
                     }
                     extension.resolve(configuration.getTargetCompatibility());
-                    extension.discoverySet(project.getConfigurations().create(name));
+                    extension.discoverySet(project.getConfigurations().maybeCreate(name));
                     project.getExtensions().add(name, extension);
                     project.afterEvaluate(DISPATCHER.toAction(name, sourceSet));
                 }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void execute(JavaPlugin plugin) {`
`112`	`112`	`extension = DISPATCHER.toExtension(project);`
`113`	`113`	`}`
`114`	`114`	`extension.resolve(configuration.getTargetCompatibility());`
`115`		`- extension.discoverySet(project.getConfigurations().create(name));`
	`115`	`+ extension.discoverySet(project.getConfigurations().maybeCreate(name));`
`116`	`116`	`project.getExtensions().add(name, extension);`
`117`	`117`	`project.afterEvaluate(DISPATCHER.toAction(name, sourceSet));`
`118`	`118`	`}`