Skip to content
Snippets Groups Projects
Commit 70620d85 authored by Hallvard Trætteberg's avatar Hallvard Trætteberg
Browse files

Think it's fixed now

parent c5cd9c7f
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment