Making it to compile (#1701)

Co-authored-by: Cesar Munoz <likethesalad@gmail.com>
raphw · Aug 20, 2024 · 86e107c · 86e107c
1 parent c3c2031
commit 86e107c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/...droid-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidPlugin.java b/...droid-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidPlugin.java
@@ -485,7 +485,6 @@ public void accept(Project project, Variant variant, Configuration configuration
                     LegacyByteBuddyLocalClassesEnhancerTask.class,
                     new LegacyByteBuddyLocalClassesEnhancerTask.ConfigurationAction(ByteBuddyViewConfiguration.toClassPath(project, configuration),
                         project.getExtensions().getByType(BaseExtension.class),
-                        (ByteBuddyAndroidTaskExtension) project.getExtensions().getByName("byteBuddy"),
                         classPath));
                 variant.getArtifacts()
                     .use(provider)
@@ -585,8 +584,7 @@ public void accept(Project project, Variant variant, Configuration configuration
                     ByteBuddyLocalClassesEnhancerTask.class,
                     new ByteBuddyLocalClassesEnhancerTask.ConfigurationAction(ByteBuddyViewConfiguration.toClassPath(project, configuration),
                             project.getExtensions().getByType(BaseExtension.class),
-                            project.getExtensions().getByType(ByteBuddyAndroidTaskExtension.class),
-                            (ByteBuddyAndroidTaskExtension) project.getExtensions().getByName("byteBuddy")));
+                            project.getExtensions().getByType(ByteBuddyAndroidTaskExtension.class)));
                 try {
                     toTransform.invoke(use.invoke(forScope.invoke(variant.getArtifacts(), scope), provider),
                         artifact,

diff --git a/...lugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidTaskExtension.java b/...lugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidTaskExtension.java
@@ -15,25 +15,13 @@
  */
 package net.bytebuddy.build.gradle.android;
 
-import groovy.lang.Closure;
-import net.bytebuddy.ClassFileVersion;
 import net.bytebuddy.build.EntryPoint;
-import net.bytebuddy.build.gradle.*;
-import net.bytebuddy.utility.nullability.MaybeNull;
-import net.bytebuddy.utility.nullability.UnknownNull;
-import org.gradle.api.Action;
-import org.gradle.api.JavaVersion;
 import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.file.FileCollection;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * A Byte Buddy task extension for Android.
  */
-public abstract class ByteBuddyAndroidTaskExtension {
+public class ByteBuddyAndroidTaskExtension {
 
     /**
      * The current Gradle project.
@@ -414,7 +402,9 @@ public void setLazy(boolean lazy) {
      *
      * @return {@code true} if this extension defines an empty discovery.
      */
-    protected abstract boolean isEmptyDiscovery();
+    protected boolean isEmptyDiscovery() {
+        return false;
+    }
 
     /**
      * Applies this extension's properties.

diff --git a/...n/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java b/...n/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java
@@ -122,6 +122,8 @@ public abstract class ByteBuddyLocalClassesEnhancerTask extends DefaultTask {
     @OutputFile
     public abstract RegularFileProperty getOutputFile();
 
+    @Input
+    @Optional
     public abstract Property<Boolean> getLazy();
 
     /**