Skip to content

Commit

Permalink
Updates (#4402)
Browse files Browse the repository at this point in the history
* Update Guava from 26 -> 27

* Update mysql-connector-java from 8.0.12 -> 8.0.13

* Update checkstyle from 8.13 -> 8.14

* Add update exception for shadow gradle plugin 4.x

* Update install4j gradle plugin from 7.0.7 -> 7.0.8

* Add exception for the gradle build scan plugin
  • Loading branch information
LinusDietz authored and Siedlerchr committed Oct 23, 2018
1 parent 780c958 commit eda8e26
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ buildscript {

plugins {
id 'com.gradle.build-scan' version '1.16'
id 'com.install4j.gradle' version '7.0.7'
id 'com.install4j.gradle' version '7.0.8'
id 'com.github.johnrengelman.shadow' version '2.0.4'
id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
id "com.simonharrer.modernizer" version '1.6.0-1'
Expand Down Expand Up @@ -119,13 +119,13 @@ dependencies {
antlr4 'org.antlr:antlr4:4.7.1'
compile 'org.antlr:antlr4-runtime:4.7.1'

compile 'mysql:mysql-connector-java:8.0.12'
compile 'mysql:mysql-connector-java:8.0.13'

compile 'org.postgresql:postgresql:42.2.5'

compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'

compile 'com.google.guava:guava:26.0-jre'
compile 'com.google.guava:guava:27.0-jre'

// JavaFX stuff
compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
Expand Down Expand Up @@ -182,7 +182,7 @@ dependencies {
testCompile "org.testfx:testfx-core:4.0.+"
testCompile "org.testfx:testfx-junit5:4.0.+"

checkstyle 'com.puppycrawl.tools:checkstyle:8.13'
checkstyle 'com.puppycrawl.tools:checkstyle:8.14'
}

jacoco {
Expand All @@ -204,6 +204,11 @@ 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 All @@ -216,8 +221,8 @@ dependencyUpdates.resolutionStrategy = {
}
}
rules.withModule("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin") { ComponentSelection selection ->
if (selection.candidate.version == /4.0.1/) {
selection.reject("Version 4.0.1 breaks the release process.")
if (selection.candidate.version ==~ /4.*/) {
selection.reject("Version 4.X breaks the release process.")
}
}
rules.withModule("de.jensd:fontawesomefx-materialdesignfont") { ComponentSelection selection ->
Expand Down

0 comments on commit eda8e26

Please sign in to comment.