From 581519d73865add438637a6602dce114db5f6cd0 Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Thu, 26 Sep 2024 20:40:02 +0000 Subject: [PATCH] Remove dead dependencies. --- com.io7m.laurel.filemodel/pom.xml | 2 +- com.io7m.laurel.gui.main/pom.xml | 7 +------ com.io7m.laurel.gui/pom.xml | 7 +------ .../java/com/io7m/laurel/gui/internal/LExporterView.java | 9 ++------- com.io7m.laurel.gui/src/main/java/module-info.java | 3 --- com.io7m.laurel.model/pom.xml | 2 +- com.io7m.laurel.tests/pom.xml | 2 +- com.io7m.laurel.tests/src/main/java/module-info.java | 3 --- pom.xml | 2 +- 9 files changed, 8 insertions(+), 29 deletions(-) diff --git a/com.io7m.laurel.filemodel/pom.xml b/com.io7m.laurel.filemodel/pom.xml index 9ce8338..b37c92a 100644 --- a/com.io7m.laurel.filemodel/pom.xml +++ b/com.io7m.laurel.filemodel/pom.xml @@ -9,7 +9,7 @@ com.io7m.laurel com.io7m.laurel - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT com.io7m.laurel.filemodel diff --git a/com.io7m.laurel.gui.main/pom.xml b/com.io7m.laurel.gui.main/pom.xml index ec8c36d..8f9f552 100644 --- a/com.io7m.laurel.gui.main/pom.xml +++ b/com.io7m.laurel.gui.main/pom.xml @@ -9,7 +9,7 @@ com.io7m.laurel com.io7m.laurel - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT com.io7m.laurel.gui.main @@ -29,11 +29,6 @@ com.io7m.laurel.gui ${project.version} - - ${project.groupId} - com.io7m.laurel.io - ${project.version} - ch.qos.logback diff --git a/com.io7m.laurel.gui/pom.xml b/com.io7m.laurel.gui/pom.xml index fc88592..17cd584 100644 --- a/com.io7m.laurel.gui/pom.xml +++ b/com.io7m.laurel.gui/pom.xml @@ -9,7 +9,7 @@ com.io7m.laurel com.io7m.laurel - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT com.io7m.laurel.gui @@ -29,11 +29,6 @@ com.io7m.laurel.model ${project.version} - - ${project.groupId} - com.io7m.laurel.io - ${project.version} - com.io7m.jaffirm diff --git a/com.io7m.laurel.gui/src/main/java/com/io7m/laurel/gui/internal/LExporterView.java b/com.io7m.laurel.gui/src/main/java/com/io7m/laurel/gui/internal/LExporterView.java index bb80604..d5109f9 100644 --- a/com.io7m.laurel.gui/src/main/java/com/io7m/laurel/gui/internal/LExporterView.java +++ b/com.io7m.laurel.gui/src/main/java/com/io7m/laurel/gui/internal/LExporterView.java @@ -22,7 +22,6 @@ import com.io7m.jwheatsheaf.api.JWFileChooserConfiguration; import com.io7m.jwheatsheaf.oxygen.JWOxygenIconSet; import com.io7m.laurel.filemodel.LFileModelType; -import com.io7m.laurel.io.LExportRequest; import com.io7m.repetoir.core.RPServiceDirectoryType; import javafx.fxml.FXML; import javafx.scene.control.Button; @@ -43,7 +42,7 @@ public final class LExporterView extends LAbstractViewWithModel { private final Stage stage; private final LPreferencesType preferences; - private Optional result; + private Optional result; private final LExporterDialogs dialogs; private final LFileChoosers fileChoosers; @@ -85,7 +84,7 @@ public LExporterView( * @return The resulting request, if any */ - public Optional result() + public Optional result() { return this.result; } @@ -171,10 +170,6 @@ private void onCancel() @FXML private void onExport() { - this.result = Optional.of(new LExportRequest( - this.dialogs.directoryProperty().get(), - this.includeImages.isSelected() - )); this.stage.close(); } } diff --git a/com.io7m.laurel.gui/src/main/java/module-info.java b/com.io7m.laurel.gui/src/main/java/module-info.java index 5694783..49defa9 100644 --- a/com.io7m.laurel.gui/src/main/java/module-info.java +++ b/com.io7m.laurel.gui/src/main/java/module-info.java @@ -24,10 +24,7 @@ requires static org.osgi.annotation.bundle; requires com.io7m.laurel.filemodel; - requires com.io7m.laurel.io; requires com.io7m.laurel.model; - requires com.io7m.laurel.reader.api; - requires com.io7m.laurel.writer.api; requires com.io7m.anethum.api; requires com.io7m.darco.api; diff --git a/com.io7m.laurel.model/pom.xml b/com.io7m.laurel.model/pom.xml index aa8da2b..80199ae 100644 --- a/com.io7m.laurel.model/pom.xml +++ b/com.io7m.laurel.model/pom.xml @@ -9,7 +9,7 @@ com.io7m.laurel com.io7m.laurel - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT com.io7m.laurel.model diff --git a/com.io7m.laurel.tests/pom.xml b/com.io7m.laurel.tests/pom.xml index 8767968..3cc0b69 100644 --- a/com.io7m.laurel.tests/pom.xml +++ b/com.io7m.laurel.tests/pom.xml @@ -9,7 +9,7 @@ com.io7m.laurel com.io7m.laurel - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT com.io7m.laurel.tests diff --git a/com.io7m.laurel.tests/src/main/java/module-info.java b/com.io7m.laurel.tests/src/main/java/module-info.java index 23a7089..be6a0bf 100644 --- a/com.io7m.laurel.tests/src/main/java/module-info.java +++ b/com.io7m.laurel.tests/src/main/java/module-info.java @@ -23,9 +23,6 @@ requires static org.osgi.annotation.versioning; requires com.io7m.laurel.model; - requires com.io7m.laurel.io; - requires com.io7m.laurel.reader.api; - requires com.io7m.laurel.writer.api; requires com.io7m.laurel.gui; requires com.io7m.laurel.filemodel; diff --git a/pom.xml b/pom.xml index 51c86e2..c6d1f81 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.io7m.laurel com.io7m.laurel - 0.0.1-SNAPSHOT + 1.0.0-SNAPSHOT pom com.io7m.laurel