From a7d04263fb6a324e44d22ffb3019feee77002c36 Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Thu, 13 Nov 2025 16:42:16 -0800
Subject: [PATCH] Clean up files

---
 .../AdbstartPluginFunctionalTest.java}              |  9 ++++-----
 .../java/org/fbluemle/AdbstartPluginPlugin.java     | 13 -------------
 .../java/org/fbluemle/adbstart/AdbStartPlugin.java  |  3 +--
 .../AdbstartPluginTest.java}                        |  4 ++--
 4 files changed, 7 insertions(+), 22 deletions(-)
 rename plugin/src/functionalTest/java/org/fbluemle/{AdbstartPluginPluginFunctionalTest.java => adbstart/AdbstartPluginFunctionalTest.java} (84%)
 delete mode 100644 plugin/src/main/java/org/fbluemle/AdbstartPluginPlugin.java
 rename plugin/src/test/java/org/fbluemle/{AdbstartPluginPluginTest.java => adbstart/AdbstartPluginTest.java} (86%)

diff --git a/plugin/src/functionalTest/java/org/fbluemle/AdbstartPluginPluginFunctionalTest.java b/plugin/src/functionalTest/java/org/fbluemle/adbstart/AdbstartPluginFunctionalTest.java
similarity index 84%
rename from plugin/src/functionalTest/java/org/fbluemle/AdbstartPluginPluginFunctionalTest.java
rename to plugin/src/functionalTest/java/org/fbluemle/adbstart/AdbstartPluginFunctionalTest.java
index 1968779..9578e44 100644
--- a/plugin/src/functionalTest/java/org/fbluemle/AdbstartPluginPluginFunctionalTest.java
+++ b/plugin/src/functionalTest/java/org/fbluemle/adbstart/AdbstartPluginFunctionalTest.java
@@ -1,4 +1,4 @@
-package org.fbluemle;
+package org.fbluemle.adbstart;
 
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
@@ -13,7 +13,7 @@
 
 import static org.junit.Assert.assertTrue;
 
-public class AdbstartPluginPluginFunctionalTest {
+public class AdbstartPluginFunctionalTest {
     @Rule
     public TemporaryFolder testProjectDir = new TemporaryFolder();
 
@@ -30,8 +30,8 @@ public void appliesPluginAndBuildsHelpTask() throws IOException {
         writeString(getSettingsFile(), "");
         writeString(getBuildFile(),
                 "plugins {\n" +
-                "    id 'org.fbluemle.adbstart'\n" +
-                "}\n");
+                        "    id 'org.fbluemle.adbstart'\n" +
+                        "}\n");
 
         BuildResult result = GradleRunner.create()
                 .withProjectDir(testProjectDir.getRoot())
@@ -40,7 +40,6 @@ public void appliesPluginAndBuildsHelpTask() throws IOException {
                 .forwardOutput()
                 .build();
 
-        // If the plugin applies cleanly, the 'help' task should complete successfully
         assertTrue(result.getOutput().contains("BUILD SUCCESSFUL"));
     }
 
diff --git a/plugin/src/main/java/org/fbluemle/AdbstartPluginPlugin.java b/plugin/src/main/java/org/fbluemle/AdbstartPluginPlugin.java
deleted file mode 100644
index 750d7a0..0000000
--- a/plugin/src/main/java/org/fbluemle/AdbstartPluginPlugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.fbluemle;
-
-import org.gradle.api.Project;
-import org.gradle.api.Plugin;
-
-public class AdbstartPluginPlugin implements Plugin<Project> {
-    public void apply(Project project) {
-        // Register a task
-        project.getTasks().register("greeting", task -> {
-            task.doLast(s -> System.out.println("Hello from plugin 'org.example.greeting'"));
-        });
-    }
-}
diff --git a/plugin/src/main/java/org/fbluemle/adbstart/AdbStartPlugin.java b/plugin/src/main/java/org/fbluemle/adbstart/AdbStartPlugin.java
index 7ce377b..2af895c 100644
--- a/plugin/src/main/java/org/fbluemle/adbstart/AdbStartPlugin.java
+++ b/plugin/src/main/java/org/fbluemle/adbstart/AdbStartPlugin.java
@@ -12,8 +12,7 @@
 public class AdbStartPlugin implements Plugin<Project> {
     @Override
     public void apply(Project project) {
-        AdbStartExtension ext = project.getExtensions()
-                .create("adbStart", AdbStartExtension.class);
+        AdbStartExtension ext = project.getExtensions().create("adbStart", AdbStartExtension.class);
 
         project.getPlugins().withId("com.android.application", p -> {
             try {
diff --git a/plugin/src/test/java/org/fbluemle/AdbstartPluginPluginTest.java b/plugin/src/test/java/org/fbluemle/adbstart/AdbstartPluginTest.java
similarity index 86%
rename from plugin/src/test/java/org/fbluemle/AdbstartPluginPluginTest.java
rename to plugin/src/test/java/org/fbluemle/adbstart/AdbstartPluginTest.java
index 0449a49..74cf5b6 100644
--- a/plugin/src/test/java/org/fbluemle/AdbstartPluginPluginTest.java
+++ b/plugin/src/test/java/org/fbluemle/adbstart/AdbstartPluginTest.java
@@ -1,4 +1,4 @@
-package org.fbluemle;
+package org.fbluemle.adbstart;
 
 import org.gradle.api.Project;
 import org.gradle.testfixtures.ProjectBuilder;
@@ -6,7 +6,7 @@
 
 import static org.junit.Assert.*;
 
-public class AdbstartPluginPluginTest {
+public class AdbstartPluginTest {
     @Test
     public void pluginAppliesAndCreatesExtension() {
         Project project = ProjectBuilder.builder().build();