From 425eaa5c760ebcba4233b704681ce6d3c5f00fe2 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 16 Oct 2017 15:08:37 -0700 Subject: [PATCH 1/3] Update Flowless to 0.6 --- richtextfx/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/richtextfx/build.gradle b/richtextfx/build.gradle index 3c5628695..c46515e88 100644 --- a/richtextfx/build.gradle +++ b/richtextfx/build.gradle @@ -26,8 +26,8 @@ if (gradle.gradleVersion.substring(0, 1) >= "4") { } dependencies { compile group: 'org.reactfx', name: 'reactfx', version: '2.0-M5' - compile (group: 'org.fxmisc.undo', name: 'undofx', version: '1.3.1') - compile (group: 'org.fxmisc.flowless', name: 'flowless', version: '0.6-SNAPSHOT') + compile group: 'org.fxmisc.undo', name: 'undofx', version: '1.3.1' + compile group: 'org.fxmisc.flowless', name: 'flowless', version: '0.6' compile group: 'org.fxmisc.wellbehaved', name: 'wellbehavedfx', version: '0.3' testCompile group: 'junit', name: 'junit', version: '4.12' @@ -71,7 +71,7 @@ javadoc { 'http://www.reactfx.org/javadoc/2.0-M5/', // resolve links to Flowless - 'https://fxmisc.github.io/flowless/javadoc/0.5/' + 'https://fxmisc.github.io/flowless/javadoc/0.6/' ] } From 52ff5fc089094300d955392d3cb66ff938bbeb18 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 16 Oct 2017 15:11:46 -0700 Subject: [PATCH 2/3] Resolve links to Tomas' other projects --- richtextfx/build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/richtextfx/build.gradle b/richtextfx/build.gradle index c46515e88..daff93c66 100644 --- a/richtextfx/build.gradle +++ b/richtextfx/build.gradle @@ -69,9 +69,11 @@ javadoc { // resolve links to ReactFX 'http://www.reactfx.org/javadoc/2.0-M5/', - - // resolve links to Flowless - 'https://fxmisc.github.io/flowless/javadoc/0.6/' + + // resolve links to FXMisc projects + 'https://fxmisc.github.io/undo/javadoc/1.3.1/', + 'https://fxmisc.github.io/flowless/javadoc/0.6/', + 'https://fxmisc.github.io/wellbehaved/javadoc/0.3/' ] } From f49cc1582d6c88643ea8797317892fd110a62d89 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 20 Oct 2017 09:01:48 -0700 Subject: [PATCH 3/3] Remove deprecated Travis' Linux Precise build; add comments --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74cbeac70..c0563db25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,18 +4,18 @@ sudo: false # Linux OS: run in container matrix: include: - - os: linux - dist: precise - jdk: oraclejdk8 + # Java 8 Linux build - os: linux dist: trusty jdk: oraclejdk8 + # Java 9 Linux build - os: linux dist: trusty jdk: oraclejdk9 env: _JAVA_OPTIONS="-DcheckSourceCompatibility=9" - # Headless Build: xvfb + TestFX does not work on Travis OSX environments (as of 2017-05-24) + # Headless Build: xvfb + TestFX does not work on Travis OSX environments (as of 2017-05-24) + # Java 8 Mac build - os: osx osx_image: xcode9 env: _JAVA_OPTIONS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"