fix: Extensions

Author: julian-siebert

src/main/java/studio/o7/remora/RemoraPlugin.java

@@ -14,8 +14,6 @@
 import org.gradle.api.provider.Property;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 import org.gradle.plugins.signing.SigningPlugin;
-import studio.o7.remora.extensions.DefaultRemoraExtension;
-import studio.o7.remora.extensions.FrameworkExtension;
 import studio.o7.remora.extensions.RemoraExtension;
 
 public class RemoraPlugin implements Plugin<Project> {
@@ -40,17 +38,13 @@ public void apply(Project project) {
 
     public static RemoraExtension setupExtension(@NonNull Logger logger, @NonNull ExtensionContainer extensions) {
         logger.info("Setting up the `remora` extension");
-        return extensions.create("remora", DefaultRemoraExtension.class);
+        return extensions.create("remora", RemoraExtension.class);
     }
 
     public static void applyNecessaryProjectConfiguration(@NonNull Logger logger, @NonNull Project project, @NonNull RemoraExtension extension) {
         logger.info("Applying project `group` and `description` configuration");
-        project.setGroup(extension.getGroupId().get());
-
-        Property<String> description = extension.getDescription();
-        if (description.isPresent()) {
-            project.setDescription(description.get());
-        }
+        project.setGroup(extension.getGroupId());
+        project.setDescription(extension.getDescription());
     }
 
     public static void applyJavaPluginConfiguration(@NonNull Logger logger, @NonNull Project project, @NonNull RemoraExtension extension) {
@@ -81,6 +75,7 @@ public static void applyNecessaryRepositories(@NonNull Logger logger, @NonNull P
     public static void applyDependencies(@NonNull Logger logger, @NonNull Project project, @NonNull RemoraExtension extension) {
         DependencyHandler dependencies = project.getDependencies();
 
+        /*
         FrameworkExtension framework = null;
 
         logger.info("Adding dependency `lombok`");
@@ -98,6 +93,7 @@ public static void applyDependencies(@NonNull Logger logger, @NonNull Project pr
 
             dependencies.add(fastUtils.getScope().getConfigurationName(), id);
         }
+         */
     }
 
     public static void applyPlaceholderConfiguration(@NonNull Logger logger, @NonNull Project project, @NonNull RemoraExtension extension) {

src/main/java/studio/o7/remora/extensions/DefaultRemoraExtension.java

@@ -1,19 +1,26 @@
 package studio.o7.remora.extensions;
 
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.Optional;
+import lombok.Getter;
+import lombok.Setter;
+import org.gradle.api.model.ObjectFactory;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
+import studio.o7.remora.extensions.framework.FrameworkExtension;
 
-public interface RemoraExtension {
+@Getter
+@Setter
+public class RemoraExtension {
 
-    Property<String> getGroupId();
+    private String groupId;
 
-    Property<String> getArtifactId();
+    private String artifactId;
 
-    @Optional
-    Property<String> getDescription();
+    private String description;
 
-    @Optional
-    Property<JavaLanguageVersion> getJavaVersion();
+    private JavaLanguageVersion javaVersion = JavaLanguageVersion.of(23);
 
+    private FrameworkExtension framework;
+
+    public RemoraExtension(ObjectFactory factory) {
+        this.framework = factory.newInstance(FrameworkExtension.class);
+    }
 }

src/main/java/studio/o7/remora/extensions/FrameworkExtension.java

@@ -0,0 +1,15 @@
+package studio.o7.remora.extensions.framework;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.gradle.api.model.ObjectFactory;
+
+@Getter
+@Setter
+public class FrameworkExtension {
+    private LombokExtension lombok;
+
+    public FrameworkExtension(ObjectFactory factory) {
+        lombok = factory.newInstance(LombokExtension.class);
+    }
+}

src/main/java/studio/o7/remora/extensions/PublishingExtension.java

@@ -0,0 +1,11 @@
+package studio.o7.remora.extensions.framework;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class LombokExtension {
+    private boolean enabled = true;
+    private String version = "1.18.36";
+}