Skip to content

Commit

Permalink
Try to update to gradle 5.0.2 (#4766)
Browse files Browse the repository at this point in the history
Try to update to gradle 5.3.1
  • Loading branch information
Siedlerchr committed Apr 13, 2019
1 parent 793fa88 commit 7a190c9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
27 changes: 12 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,18 @@ buildscript {
}

plugins {
id 'com.gradle.build-scan' version '1.16'
id 'com.install4j.gradle' version '7.0.9'
id 'com.github.johnrengelman.shadow' version '4.0.2'
id 'com.gradle.build-scan' version '2.0.2'
id 'com.install4j.gradle' version '7.0.10'
id 'com.github.johnrengelman.shadow' version '5.0.0'
id "com.simonharrer.modernizer" version '1.6.0-1'
id 'me.champeau.gradle.jmh' version '0.4.8'
id 'net.ltgt.errorprone' version '0.6.1'
id 'com.github.ben-manes.versions' version '0.20.0'
id 'net.ltgt.errorprone' version '0.7.1'
id 'com.github.ben-manes.versions' version '0.21.0'
}

// use the gradle build scan feature: https://scans.gradle.com/get-started
buildScan {
licenseAgreementUrl = 'https://gradle.com/terms-of-service'
licenseAgree = 'yes'
}
buildScan { termsOfServiceUrl = 'https://gradle.com/terms-of-service'; termsOfServiceAgree = 'yes' }


apply plugin: 'java'
apply plugin: 'application'
Expand Down Expand Up @@ -129,9 +127,10 @@ dependencies {
compile 'com.google.guava:guava:27.1-jre'

// JavaFX stuff
compile 'de.jensd:fontawesomefx-commons:8.15'
compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
compile 'de.saxsys:mvvmfx-validation:1.8.0'
compile 'de.saxsys:mvvmfx:1.7.0'
compile 'de.saxsys:mvvmfx:1.8.0'
compile 'org.fxmisc.easybind:easybind:1.0.3'
compile 'org.fxmisc.flowless:flowless:0.6.1'
compile 'org.fxmisc.richtext:richtextfx:0.9.3'
Expand Down Expand Up @@ -196,11 +195,6 @@ dependencyUpdates.resolutionStrategy = {
selection.reject("Ignore SNAPSHOT releases")
}
}
rules.withModule("com.gradle.build-scan:com.gradle.build-scan.gradle.plugin") { ComponentSelection selection ->
if (selection.candidate.version ==~ /2.*/) {
selection.reject("Cannot be upgraded to version 2 until we upgrade to gradle 5")
}
}
rules.withModule("org.controlsfx:controlsfx") { ComponentSelection selection ->
if (selection.candidate.version ==~ /9.*/) { // Reject version 9 or higher
selection.reject("Cannot be updated to 9.*.* until Jabref works with Java 9")
Expand Down Expand Up @@ -322,11 +316,14 @@ task generateSearchGrammarSource(type: JavaExec) {
compileJava {
options.encoding = 'UTF-8'
options.compilerArgs << "-Xlint:none"
//ignore annotation processor from log4j2
options.compilerArgs += '-proc:none'
}
compileJava.dependsOn "generateSource"

compileTestJava {
options.encoding = 'UTF-8'
options.compilerArgs += '-proc:none'
}

javadoc {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 7a190c9

Please sign in to comment.