Correct class loading and use maybe create for configuration.

raphw · Jan 3, 2023 · 5ffe97c · 5ffe97c
1 parent a070a5d
commit 5ffe97c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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));
                 }