diff --git a/simpleexample/build.gradle b/simpleexample/build.gradle index 882f5e7211aafa50032a9917548c047b6ea8952c..808989bbf46ab60fc8492b961ffde598d55d8a0c 100644 --- a/simpleexample/build.gradle +++ b/simpleexample/build.gradle @@ -14,6 +14,9 @@ repositories { url "https://plugins.gradle.org/m2/" } mavenLocal() + flatDir { + dirs 'libs' + } } mainClassName = 'simpleex.ui.FxApp' // application plugin @@ -26,29 +29,17 @@ javafx { // launch debugger using Remote Java Application debug launch configuration } -sourceSets { - main { - java { - // don't include UI without FxMapControl installed - if (project.hasProperty('gitlab-ci')) { - exclude 'simpleex.ui/*' - } - } - } -} - test { // don't run UI test on server (that cannot run javafx) - if (project.hasProperty('gitlab-ci')) { - exclude 'simpleex.ui/*' + if (project.hasProperty('ci') && "$ci" == 'gitlab') { + exclude 'simpleex/ui/*' } } dependencies { compile "com.fasterxml.jackson.core:jackson-databind:2.9.8" - if (! project.hasProperty('gitlab-ci')) { - compile 'fischer.clemens:FxMapControl:1.0' - } + // compile 'fischer.clemens:FxMapControl:1.0' + compile name: 'fx-map-control-1.0' testImplementation 'junit:junit:4.12' testImplementation "org.testfx:testfx-core:4.0.16-alpha" testImplementation "org.testfx:testfx-junit:4.0.16-alpha" diff --git a/simpleexample/libs/fx-map-control-1.0.jar b/simpleexample/libs/fx-map-control-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..13fea70c9065be5e42a5be2270dca488ca794fed Binary files /dev/null and b/simpleexample/libs/fx-map-control-1.0.jar differ