diff --git a/.travis.yml b/.travis.yml index b1c498dc..98b7657d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java sudo: false jdk: -- oraclejdk8 +- openjdk11 before_install: - chmod +x ./gradlew script: @@ -20,7 +20,7 @@ deploy: script: ./gradlew bintrayUpload -Ddeployment=true on: tags: true - jdk: oraclejdk8 + jdk: openjdk11 - provider: pages skip_cleanup: true github-token: $GITHUB_TOKEN @@ -28,6 +28,6 @@ deploy: keep-history: false on: branch: master - jdk: oraclejdk8 + jdk: openjdk11 after_success: - bash <(curl -s https://codecov.io/bash) \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4709f5e6..d906e719 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import org.gradle.api.JavaVersion + buildscript { project.ext['CERN_VM'] = System.getProperty('CERN_TECHNET_VM') ?: System.getenv('CERN_TECHNET_VM') ?: project.hasProperty('CERN_TECHNET_VM') ?: false project.ext['DEPLOYMENT'] = System.getProperty('deployment') ?: false @@ -25,10 +27,16 @@ buildscript { } } + +plugins { + id 'org.openjfx.javafxplugin' version '0.0.7' apply false +} + apply plugin: 'java' apply plugin: 'jacoco' apply plugin: 'idea' apply plugin: 'eclipse' +apply plugin: 'org.openjfx.javafxplugin' group = project['POM.groupId'] @@ -43,12 +51,13 @@ repositories { maven { url "https://dl.bintray.com/minifx/minifx-repo" } /* For the fontawesome icons, to be compatible with java 8 */ maven { url "https://dl.bintray.com/jerady/maven" } - mavenCentral() + jcenter() + //mavenCentral() } } dependencies { - compile group: 'org.minifx', name: 'minifx-fxml', version: '0.0.2' + compile group: 'org.minifx', name: 'minifx-fxml', version: '2.0.0' compile group: 'com.google.guava', name: 'guava', version: guavaVersion compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7' @@ -56,9 +65,11 @@ dependencies { compile group: 'org.springframework', name: 'spring-core', version: springVersion compile group: 'org.springframework', name: 'spring-context', version: springVersion - compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-5' compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-11' + compile("javax.annotation:javax.annotation-api:1.3.2") + testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'org.assertj', name: 'assertj-core', version: '3.9.1' @@ -83,6 +94,10 @@ test { } } +jacoco { + toolVersion = "0.8.5" +} + jacocoTestReport { reports { xml.enabled true @@ -138,3 +153,13 @@ if (project['DEPLOYMENT']) { apply plugin: 'com.jfrog.bintray' apply from: 'https://raw.githubusercontent.com/ossgang/gradle-scripts/master/deployment/bintray-deploy.gradle' } + +javafx { + // version = "12.0.1" + modules = ['javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.web'] +} + +task printJavaVersion { + println 'Java Version: ' + JavaVersion.current(); +} +