diff --git a/build.gradle b/build.gradle index aaa7cde..8b05316 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'application' id 'com.adarshr.test-logger' version '2.0.0' id 'java' - id 'org.beryx.jlink' version "2.17.3" + id 'org.beryx.jlink' version "2.17.4" id 'org.openjfx.javafxplugin' version "0.0.8" id "com.github.ben-manes.versions" version "0.28.0" id "org.javamodularity.moduleplugin" version "1.5.0" //BUGS in 1.6.0 @@ -22,7 +22,7 @@ repositories { } } -version = '0.1.3' +version = '0.1.4' dependencies { implementation 'com.fatboyindustrial.gson-javatime-serialisers:gson-javatime-serialisers:1.1.1' @@ -34,11 +34,12 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.8.1' implementation 'com.squareup.retrofit2:retrofit:2.8.1' implementation 'com.typesafe:config:1.4.0' + implementation 'io.reactivex.rxjava3:rxjava:3.0.2' implementation 'org.bushe:eventbus:1.4' implementation 'org.fxmisc.easybind:easybind:1.0.3' implementation 'org.mbari:mbarix4j:2.0.5.jre11' - implementation 'org.mbari.vcr4j:vcr4j-core:4.0.2' - implementation 'org.mbari.vcr4j:vcr4j-sharktopoda:4.0.2' + implementation 'org.mbari.vcr4j:vcr4j-core:4.4.0.jre11' + implementation 'org.mbari.vcr4j:vcr4j-sharktopoda:4.4.0.jre11' implementation 'org.slf4j:slf4j-api:2.0.0-alpha1' runtimeOnly 'ch.qos.logback:logback-classic:1.3.0-alpha4' // 1.3.0-alpha5 isn't working with Jansi runtimeOnly 'com.h2database:h2:1.4.200' @@ -51,7 +52,7 @@ dependencies { runtimeOnly 'org.apache.derby:derbynet:10.15.2.0' runtimeOnly 'org.apache.derby:derbyshared:10.15.2.0' runtimeOnly 'org.apache.derby:derbytools:10.15.2.0' - runtimeOnly 'org.postgresql:postgresql:42.2.6' + runtimeOnly 'org.postgresql:postgresql:42.2.12' testImplementation 'junit:junit:4.13' implementation('org.jfxtras:jfxtras-controls:10.0-r1') { @@ -67,7 +68,7 @@ dependencies { } javafx { - version = "11.0.2" + version = "14" modules = [ 'javafx.base', 'javafx.controls', @@ -167,4 +168,15 @@ jlink { } +} + +tasks.jpackageImage.doLast { + if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) { + copy { + println("MACOSX: Adding VARS Query.icns") + from "src/jpackage/macos" + include "VARS Query.icns" + into "build/jpackage/VARS Query.app/Contents/Resources" + } + } } \ No newline at end of file diff --git a/src/jpackage/macos/VARS Query.icns b/src/jpackage/macos/VARS Query.icns new file mode 100644 index 0000000..52d27a2 Binary files /dev/null and b/src/jpackage/macos/VARS Query.icns differ diff --git a/src/jpackage/macos/VARS Query.png b/src/jpackage/macos/VARS Query.png new file mode 100644 index 0000000..0d9d4e4 Binary files /dev/null and b/src/jpackage/macos/VARS Query.png differ diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index b7ee734..16c9c73 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -9,9 +9,10 @@ requires javafx.fxml; requires jfxtras.controls; requires mbarix4j; - requires rxjava; + // requires io.reactive.rxjava3; requires sdkfx; requires org.slf4j; requires typesafe.config; requires vcr4j.core; + requires vcr4j.sharktopoda; } \ No newline at end of file