Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-15 05:22:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of Gradle JavaFX plugin

Browse Source 
As documented at [1], version 8.1.1 of the Gradle JavaFX plugin has
disappeared from bintray. This causes Travis CI build failures. Version
8.1.0 is still in place [2], but downgrading to it causes further build
errors.

This commit removes use of the plugin entirely in order to fix the CI
problem immediately. In the meantime, the Bitsquare UI must be launched
directly from within IDEA.

Resolves #221
See #66

[1]: https://bitbucket.org/shemnon/javafx-gradle/issue/46/received-status-code-401-from-server
[2]: http://dl.bintray.com/content/shemnon/javafx-gradle/org/bitbucket/shemnon/javafxplugin/gradle-javafx-plugin/
This commit is contained in:
Chris Beams 2014-10-13 11:06:40 +02:00
parent eaaa0e090c
commit 5f53fea190
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
2 changed files with 1 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.gradle
View File

@ -1,25 +1,10 @@
apply from: 'gradle/javafx.gradle'
apply plugin: 'java'
version = '0.1.0-SNAPSHOT'
sourceCompatibility = 1.8
sourceSets.main.resources.srcDirs += 'src/main/java'
javafx {
appID 'Bitsquare'
appName 'Bitsquare'
mainClass 'io.bitsquare.BitSquareUI'
profiles {
windows {
javaRuntime = 'C:/Program Files/Java/jdk1.8.0_20/jre'
bundleArguments = [
'win.msi.productVersion' : '0.1.0'
]
}
}
}
repositories {
jcenter()
maven { url 'http://partnerdemo.artifactoryonline.com/partnerdemo/libs-snapshots-local' }

95
gradle/javafx.gradle
View File

@ -1,95 +0,0 @@
/*
* Bootstrap script for the Gradle JavaFX Plugin.
* (based on http://plugins.jasoft.fi/vaadin.plugin)
*
* The script will add the plugin to the build script
* dependencies and apply the plugin to the project. If you do not want
* this behavior you can copy and paste the below configuration into your
* own build script and define your own repository and version for the plugin.
*/
import org.gradle.api.GradleException;
buildscript {
repositories {
maven {
name = 'JavaFX Gradle plugin'
url = 'http://dl.bintray.com/content/shemnon/javafx-gradle/'
}
maven {
name = 'CloudBees snapshots'
url = 'http://repository-javafx-gradle-plugin.forge.cloudbees.com/snapshot'
}
ivy {
name = 'CloudBees snapshots'
url = 'http://repository-javafx-gradle-plugin.forge.cloudbees.com/snapshot'
}
jcenter()
}
dependencies {
try {
assert (jfxrtDir != null)
} catch (RuntimeException re) {
ext.jfxrtDir = "."
}
ext.searchFile = {Map<String, Closure> places, List<String> searchPaths, String searchID ->
File result = null;
places.each { k, v ->
if (result != null) return;
project.logger.debug("Looking for $searchID in $k")
def dir = v()
if (dir == null) {
project.logger.debug("$k not set")
} else {
project.logger.debug("$k is $dir")
searchPaths.each { s ->
if (result != null) return;
File f = new File(dir, s);
project.logger.debug("Trying $f.path")
if (f.exists() && f.file) {
project.logger.debug("found $searchID as $result")
result = f;
}
}
}
}
if (!result?.file) {
throw new GradleException("Could not find $searchID, please set one of ${places.keySet()}");
} else {
project.logger.info("$searchID: ${result}")
return result
}
}
ext.findJFXJar = {
return searchFile([
'jfxrtDir in Gradle Properties': {jfxrtDir},
'JFXRT_HOME in System Environment': {System.env['JFXRT_HOME']},
'JAVA_HOME in System Environment': {System.env['JAVA_HOME']},
'java.home in JVM properties': {System.properties['java.home']}
],
['jfxrt.jar', 'lib/jfxrt.jar', 'lib/ext/jfxrt.jar', 'jre/lib/jfxrt.jar', 'jre/lib/ext/jfxrt.jar'],
'JavaFX Runtime Jar')
}
ext.findAntJavaFXJar = {
return searchFile([
'jfxrtDir in Gradle Properties': {jfxrtDir},
'JFXRT_HOME in System Environment': {System.env['JFXRT_HOME']},
'JAVA_HOME in System Environment': {System.env['JAVA_HOME']},
'java.home in JVM properties': {System.properties['java.home']}
],
['ant-javafx.jar', 'lib/ant-javafx.jar', '../lib/ant-javafx.jar'],
'JavaFX Packager Tools')
}
classpath 'org.bitbucket.shemnon.javafxplugin:gradle-javafx-plugin:8.1.1'
classpath project.files(findAntJavaFXJar())
classpath project.files(findJFXJar())
}
}
if (!project.plugins.findPlugin(org.bitbucket.shemnon.javafxplugin.JavaFXPlugin)) {
project.apply(plugin: org.bitbucket.shemnon.javafxplugin.JavaFXPlugin)
}