Skip to content

Commit

Permalink
Change module prefixes to one.jpro.platform
Browse files Browse the repository at this point in the history
  • Loading branch information
besidev committed Aug 23, 2023
1 parent 96a81c5 commit d716e2c
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
}
}
Expand All @@ -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"
]
}
8 changes: 4 additions & 4 deletions example/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion freeze-detector/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author Besmir Beqiri
*/
module one.jpro.freezedetector {
module one.jpro.platform.freezedetector {
requires javafx.graphics;

exports one.jpro.platform.freezedetector;
Expand Down
2 changes: 1 addition & 1 deletion htmlscrollpane/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion jpro-auth/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions jpro-media/DOCUMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ 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'
]
}
}
```
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
Expand All @@ -72,7 +72,7 @@ the `release` zipped file. Even the `jpro:run` task is faster since these files
<dependency>
<groupId>one.jpro.jproutils</groupId>
<artifactId>jpro-media</artifactId>
<version>0.2.3-SNAPSHOT</version>
<version>0.2.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -94,7 +94,7 @@ the `release` zipped file. Even the `jpro:run` task is faster since these files
<mainClass>one.jpro.example.App</mainClass>
<options>
<option>--add-exports</option>
<option>javafx.base/com.sun.javafx.event=one.jpro.media</option>
<option>javafx.base/com.sun.javafx.event=one.jpro.platform.media</option>
</options>
</configuration>
</plugin>
Expand Down Expand Up @@ -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 {

Expand Down Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions jpro-media/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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')
}
Expand Down
2 changes: 1 addition & 1 deletion jpro-media/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jpro-routing/core/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module one.jpro.routing.core {
module one.jpro.platform.routing.core {
requires transitive javafx.controls;

requires transitive de.sandec.jnodes;
Expand Down
4 changes: 2 additions & 2 deletions jpro-routing/dev/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jpro-routing/popup/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jpro-sessions/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module one.jpro.sessionmanager {
module one.jpro.platform.sessionmanager {
requires javafx.controls;
requires jpro.webapi;
requires java.logging;
Expand Down
2 changes: 1 addition & 1 deletion tree-showing/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module jpro.utils.treeshowing {
module one.jpro.platform.treeshowing {
requires javafx.controls;
requires de.sandec.jmemorybuddy;

Expand Down

0 comments on commit d716e2c

Please sign in to comment.