Skip to content

Commit

Permalink
Updated dependencies. Added icon
Browse files Browse the repository at this point in the history
  • Loading branch information
hohonuuli committed Apr 8, 2020
1 parent 0176cd6 commit 2f9e4bf
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 7 deletions.
24 changes: 18 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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') {
Expand All @@ -67,7 +68,7 @@ dependencies {
}

javafx {
version = "11.0.2"
version = "14"
modules = [
'javafx.base',
'javafx.controls',
Expand Down Expand Up @@ -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"
}
}
}
Binary file added src/jpackage/macos/VARS Query.icns
Binary file not shown.
Binary file added src/jpackage/macos/VARS Query.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit 2f9e4bf

Please sign in to comment.