From d716e2c9e863f988ee933bffeb265e2c3c9f5d62 Mon Sep 17 00:00:00 2001 From: Besmir Beqiri Date: Wed, 23 Aug 2023 16:21:20 +0200 Subject: [PATCH] Change module prefixes to `one.jpro.platform` --- example/build.gradle | 4 ++-- example/src/main/java/module-info.java | 8 ++++---- .../src/main/java/module-info.java | 2 +- htmlscrollpane/src/main/java/module-info.java | 2 +- jpro-auth/src/main/java/module-info.java | 2 +- jpro-media/DOCUMENTATION.md | 20 +++++++++---------- jpro-media/build.gradle | 6 +++--- jpro-media/src/main/java/module-info.java | 2 +- .../core/src/main/java/module-info.java | 2 +- .../dev/src/main/java/module-info.java | 4 ++-- .../popup/src/main/java/module-info.java | 2 +- jpro-sessions/src/main/java/module-info.java | 2 +- tree-showing/src/main/java/module-info.java | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/example/build.gradle b/example/build.gradle index ffe7af4b..cfd53dc3 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -38,7 +38,7 @@ javafx { run { doFirst { jvmArgs = [ - '--add-exports', 'javafx.base/com.sun.javafx.event=one.jpro.media' + '--add-exports', 'javafx.base/com.sun.javafx.event=one.jpro.platform.media' ] } } @@ -47,6 +47,6 @@ application { mainClass = "$mainClassName" mainModule = moduleName applicationDefaultJvmArgs = [ - "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.media" + "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.platform.media" ] } diff --git a/example/src/main/java/module-info.java b/example/src/main/java/module-info.java index f84c366d..12588dfa 100644 --- a/example/src/main/java/module-info.java +++ b/example/src/main/java/module-info.java @@ -1,10 +1,10 @@ -module one.jpro.utils.example { +module one.jpro.platform.example { requires javafx.controls; requires javafx.media; requires jpro.webapi; requires jpro.utils.htmlscrollpane; - requires one.jpro.media; - requires one.jpro.sessionmanager; + requires one.jpro.platform.media; + requires one.jpro.platform.sessionmanager; requires atlantafx.base; @@ -24,7 +24,7 @@ requires org.bytedeco.ffmpeg.macosx.arm64; requires org.bytedeco.opencv.macosx.arm64; requires org.bytedeco.openblas.macosx.arm64; - requires one.jpro.routing.core; + requires one.jpro.platform.routing.core; exports one.jpro.platform.utils.example; exports one.jpro.platform.example.media; diff --git a/freeze-detector/src/main/java/module-info.java b/freeze-detector/src/main/java/module-info.java index 96c8ba08..ccf5e023 100644 --- a/freeze-detector/src/main/java/module-info.java +++ b/freeze-detector/src/main/java/module-info.java @@ -3,7 +3,7 @@ * * @author Besmir Beqiri */ -module one.jpro.freezedetector { +module one.jpro.platform.freezedetector { requires javafx.graphics; exports one.jpro.platform.freezedetector; diff --git a/htmlscrollpane/src/main/java/module-info.java b/htmlscrollpane/src/main/java/module-info.java index 441b456f..528037b4 100644 --- a/htmlscrollpane/src/main/java/module-info.java +++ b/htmlscrollpane/src/main/java/module-info.java @@ -2,7 +2,7 @@ requires javafx.controls; requires de.sandec.jmemorybuddy; requires jpro.webapi; - requires jpro.utils.treeshowing; + requires one.jpro.platform.treeshowing; exports one.jpro.platform.htmlscrollpane; } \ No newline at end of file diff --git a/jpro-auth/src/main/java/module-info.java b/jpro-auth/src/main/java/module-info.java index a796bff7..c6c63f62 100644 --- a/jpro-auth/src/main/java/module-info.java +++ b/jpro-auth/src/main/java/module-info.java @@ -3,7 +3,7 @@ * * @author Besmir Beqiri */ -module one.jpro.auth { +module one.jpro.platform.auth { requires javafx.graphics; requires java.net.http; requires jpro.webapi; diff --git a/jpro-media/DOCUMENTATION.md b/jpro-media/DOCUMENTATION.md index 141e93d3..62084793 100644 --- a/jpro-media/DOCUMENTATION.md +++ b/jpro-media/DOCUMENTATION.md @@ -50,7 +50,7 @@ dependencies { run { doFirst { jvmArgs = [ - '--add-exports', 'javafx.base/com.sun.javafx.event=one.jpro.media' + '--add-exports', 'javafx.base/com.sun.javafx.event=one.jpro.platform.media' ] } } @@ -58,7 +58,7 @@ run { or as an application default `jvm argument`: ```groovy applicationDefaultJvmArgs = [ - "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.media" + "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.platform.media" ] ``` ### Maven @@ -72,7 +72,7 @@ the `release` zipped file. Even the `jpro:run` task is faster since these files one.jpro.jproutils jpro-media - 0.2.3-SNAPSHOT + 0.2.4-SNAPSHOT org.bytedeco @@ -94,7 +94,7 @@ the `release` zipped file. Even the `jpro:run` task is faster since these files one.jpro.example.App - + @@ -196,9 +196,9 @@ import javafx.scene.layout.FlowPane; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; import javafx.stage.Stage; -import one.jpro.media.MediaSource; -import one.jpro.media.MediaView; -import one.jpro.media.player.MediaPlayer; +import one.jpro.platform.media.MediaSource; +import one.jpro.platform.media.MediaView; +import one.jpro.platform.media.player.MediaPlayer; public class MediaPlayerApplication extends Application { @@ -273,9 +273,9 @@ import javafx.scene.layout.Priority; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.stage.Stage; -import one.jpro.media.MediaView; -import one.jpro.media.recorder.MediaRecorder; -import one.jpro.media.util.MediaUtil; +import one.jpro.platform.media.MediaView; +import one.jpro.platform.media.recorder.MediaRecorder; +import one.jpro.platform.media.util.MediaUtil; import java.io.IOException; diff --git a/jpro-media/build.gradle b/jpro-media/build.gradle index b1bb8d53..2194a57d 100644 --- a/jpro-media/build.gradle +++ b/jpro-media/build.gradle @@ -19,13 +19,13 @@ dependencies { } compileJava { - options.compilerArgs = ["--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.media"] + options.compilerArgs = ["--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.platform.media"] } test { useJUnitPlatform() jvmArgs = [ - "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.media", + "--add-exports", "javafx.base/com.sun.javafx.event=one.jpro.platform.media", "--add-exports", "javafx.graphics/com.sun.javafx.application=org.testfx" ] testLogging { @@ -45,7 +45,7 @@ javadoc { version = true author = true addMultilineStringsOption("-add-exports").setValue([ - "javafx.base/com.sun.javafx.event=one.jpro.media" + "javafx.base/com.sun.javafx.event=one.jpro.platform.media" ]) addStringOption('Xdoclint:none', '-quiet') } diff --git a/jpro-media/src/main/java/module-info.java b/jpro-media/src/main/java/module-info.java index ee3080be..54440ddf 100644 --- a/jpro-media/src/main/java/module-info.java +++ b/jpro-media/src/main/java/module-info.java @@ -16,7 +16,7 @@ * * @author Besmir Beqiri */ -module one.jpro.media { +module one.jpro.platform.media { requires javafx.controls; requires javafx.media; requires javafx.swing; diff --git a/jpro-routing/core/src/main/java/module-info.java b/jpro-routing/core/src/main/java/module-info.java index 671cd986..94921bfc 100644 --- a/jpro-routing/core/src/main/java/module-info.java +++ b/jpro-routing/core/src/main/java/module-info.java @@ -1,4 +1,4 @@ -module one.jpro.routing.core { +module one.jpro.platform.routing.core { requires transitive javafx.controls; requires transitive de.sandec.jnodes; diff --git a/jpro-routing/dev/src/main/java/module-info.java b/jpro-routing/dev/src/main/java/module-info.java index b55b9243..c040b352 100644 --- a/jpro-routing/dev/src/main/java/module-info.java +++ b/jpro-routing/dev/src/main/java/module-info.java @@ -3,9 +3,9 @@ * * @author Besmir Beqiri */ -open module one.jpro.routing.dev { +open module one.jpro.platform.routing.dev { requires transitive javafx.controls; - requires one.jpro.routing.core; + requires one.jpro.platform.routing.core; requires org.kordamp.ikonli.javafx; requires org.kordamp.ikonli.evaicons; requires org.kordamp.ikonli.ionicons4; diff --git a/jpro-routing/popup/src/main/java/module-info.java b/jpro-routing/popup/src/main/java/module-info.java index b529b3fb..2b693f68 100644 --- a/jpro-routing/popup/src/main/java/module-info.java +++ b/jpro-routing/popup/src/main/java/module-info.java @@ -3,7 +3,7 @@ * * @author Besmir Beqiri */ -module one.jpro.routing.popup { +module one.jpro.platform.routing.popup { requires javafx.controls; requires simplefx.extended; requires scala.library; diff --git a/jpro-sessions/src/main/java/module-info.java b/jpro-sessions/src/main/java/module-info.java index 2b433993..8e49ffcf 100644 --- a/jpro-sessions/src/main/java/module-info.java +++ b/jpro-sessions/src/main/java/module-info.java @@ -1,4 +1,4 @@ -module one.jpro.sessionmanager { +module one.jpro.platform.sessionmanager { requires javafx.controls; requires jpro.webapi; requires java.logging; diff --git a/tree-showing/src/main/java/module-info.java b/tree-showing/src/main/java/module-info.java index 583e23bd..f13e670e 100644 --- a/tree-showing/src/main/java/module-info.java +++ b/tree-showing/src/main/java/module-info.java @@ -1,4 +1,4 @@ -module jpro.utils.treeshowing { +module one.jpro.platform.treeshowing { requires javafx.controls; requires de.sandec.jmemorybuddy;