Switch to OpenJDK10 in Gradle builds

Oracle JDK10 is EOL and is no longer available for download.
So switch to OpenJDK10 in Gradle builds.
This commit is contained in:
Devin Bileck 2018-10-19 15:46:01 -07:00
parent 29ae886ed8
commit 48c196b5d1
No known key found for this signature in database
GPG Key ID: 38750B26EA8B8C93
3 changed files with 65 additions and 1 deletions

View File

@ -1,5 +1,5 @@
language: java language: java
jdk: oraclejdk10 jdk: openjdk10
before_install: before_install:
grep -v '^#' src/main/resources/META-INF/services/bisq.asset.Asset | sort --check --dictionary-order --ignore-case grep -v '^#' src/main/resources/META-INF/services/bisq.asset.Asset | sort --check --dictionary-order --ignore-case
notifications: notifications:

View File

@ -1,9 +1,22 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
}
}
plugins { plugins {
id 'java' id 'java'
id 'maven' id 'maven'
id 'com.google.protobuf' version '0.8.5' id 'com.google.protobuf' version '0.8.5'
} }
apply plugin: 'application'
apply plugin: 'com.google.osdetector'
ext.platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
group = 'network.bisq' group = 'network.bisq'
version = '-SNAPSHOT' version = '-SNAPSHOT'
@ -19,6 +32,7 @@ tasks.withType(JavaCompile) {
repositories { repositories {
jcenter() jcenter()
mavenCentral()
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
} }
@ -59,4 +73,26 @@ dependencies {
compileOnly 'org.projectlombok:lombok:1.18.2' compileOnly 'org.projectlombok:lombok:1.18.2'
annotationProcessor 'org.projectlombok:lombok:1.18.2' annotationProcessor 'org.projectlombok:lombok:1.18.2'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile "org.openjfx:javafx-base:11:$platform"
compile "org.openjfx:javafx-graphics:11:$platform"
compile "org.openjfx:javafx-controls:11:$platform"
}
compileJava {
doFirst {
options.compilerArgs = [
'--module-path', classpath.asPath,
'--add-modules', 'javafx.controls'
]
}
}
run {
doFirst {
jvmArgs = [
'--module-path', classpath.asPath,
'--add-modules', 'javafx.controls'
]
}
} }

View File

@ -1,10 +1,12 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
mavenCentral()
} }
dependencies { dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
classpath files('gradle/witness/gradle-witness.jar') classpath files('gradle/witness/gradle-witness.jar')
classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
} }
} }
@ -13,6 +15,9 @@ apply plugin: 'application'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'witness' apply plugin: 'witness'
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.google.osdetector'
ext.platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
group = 'network.bisq' group = 'network.bisq'
version = '0.8.0-SNAPSHOT' version = '0.8.0-SNAPSHOT'
@ -36,6 +41,7 @@ sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css f
repositories { repositories {
jcenter() jcenter()
mavenCentral()
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' } maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
maven { url 'https://dl.bintray.com/jerady/maven' } maven { url 'https://dl.bintray.com/jerady/maven' }
@ -55,6 +61,11 @@ dependencies {
compile 'de.jensd:fontawesomefx-materialdesignfont:2.0.26-9.1.2' compile 'de.jensd:fontawesomefx-materialdesignfont:2.0.26-9.1.2'
compile 'com.googlecode.jcsv:jcsv:1.4.0' compile 'com.googlecode.jcsv:jcsv:1.4.0'
compile 'com.github.sarxos:webcam-capture:0.3.12' compile 'com.github.sarxos:webcam-capture:0.3.12'
compile "org.openjfx:javafx-base:11:$platform"
compile "org.openjfx:javafx-graphics:11:$platform"
compile "org.openjfx:javafx-controls:11:$platform"
compile "org.openjfx:javafx-fxml:11:$platform"
compile "org.openjfx:javafx-swing:11:$platform"
compileOnly 'org.projectlombok:lombok:1.18.2' compileOnly 'org.projectlombok:lombok:1.18.2'
@ -72,6 +83,23 @@ dependencies {
testAnnotationProcessor 'org.projectlombok:lombok:1.18.2' testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
} }
compileJava {
doFirst {
options.compilerArgs = [
'--module-path', classpath.asPath,
'--add-modules', 'javafx.controls'
]
}
}
run {
doFirst {
jvmArgs = [
'--module-path', classpath.asPath,
'--add-modules', 'javafx.controls'
]
}
}
test { test {
systemProperty 'jdk.attach.allowAttachSelf', true systemProperty 'jdk.attach.allowAttachSelf', true