Skip to content

Commit

Permalink
Target Java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
ccavanaugh committed Mar 1, 2019
1 parent 01705b5 commit cc18368
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ language: java
sudo: required

before_install:
- sudo add-apt-repository ppa:webupd8team/java -y
# - sudo add-apt-repository ppa:webupd8team/java -y
- sudo apt-get update -q
- sudo apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0 -y
- sudo apt install oracle-java8-unlimited-jce-policy -y
# - sudo apt install oracle-java8-unlimited-jce-policy -y
# - sudo apt-get install openjfx

jdk:
- oraclejdk8
# - openjdk8
#- openjdk11
- oraclejdk11

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand Down
8 changes: 2 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ allprojects {
apply plugin: 'java'
}

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11

group = 'jgnash'
version = '3.0.0-b1'
Expand All @@ -34,10 +34,6 @@ allprojects {

hibernateVersion = '5.4.1.Final'
hikariVersion = '3.3.1'

dynamicJasperVersion = '5.1.1'
jasperReportsVersion = '6.4.3'
itextVersion = '2.1.7.js6'

pdfBoxVersion = '2.0.14'

Expand Down
8 changes: 8 additions & 0 deletions jgnash-fx/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'edu.sc.seis.launch4j' version '2.4.4'
id 'org.openjfx.javafxplugin' version '0.0.7'
}

apply plugin: 'distribution'
Expand All @@ -18,6 +19,10 @@ dependencies {
compile group: 'info.picocli', name: 'picocli', version: picocliVersion
}

javafx {
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing']
}

launch4j {
copyright = 'Copyright (C) 2001-2019 Craig Cavanaugh'
mainClassName = 'jGnashFx'
Expand Down Expand Up @@ -66,6 +71,9 @@ distributions {
from { '../README.html' }
from { '../README.adoc' }
from { '../jGnashFx' }
exclude('**/*-linux*') // excludes linux specific JavaFx modules from cross platform zip
exclude('**/*-win*') // excludes windows specific JavaFx modules from cross platform zip
exclude('**/*-mac*') // excludes mac specific JavaFx modules from cross platform zip
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions jgnash-plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
plugins {
id 'org.openjfx.javafxplugin' version '0.0.7'
}

description = 'jGnash Plugin'

project.ext {
moduleName = 'jgnash.plugin'
}

javafx {
modules = [ 'javafx.controls', 'javafx.fxml' ]
}

dependencies {
compile project(':jgnash-resources')
}
Expand Down
8 changes: 8 additions & 0 deletions mt940/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
plugins {
id 'org.openjfx.javafxplugin' version '0.0.7'
}

description = 'mt940 Plugin'

dependencies {
Expand All @@ -7,6 +11,10 @@ dependencies {
compile project(':jgnash-fx')
}

javafx {
modules = [ 'javafx.controls']
}

jar {
// Keep jar clean:
exclude 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.MF'
Expand Down

0 comments on commit cc18368

Please sign in to comment.