Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates #4402

Merged
merged 6 commits into from
Oct 23, 2018
Merged

Updates #4402

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15b1630
Update Guava from 26 -> 27
LinusDietz Oct 23, 2018
b83ca60
Update mysql-connector-java from 8.0.12 -> 8.0.13
LinusDietz Oct 23, 2018
d079535
Update checkstyle from 8.13 -> 8.14
LinusDietz Oct 23, 2018
5511e94
Add update exception for shadow gradle plugin 4.x
LinusDietz Oct 23, 2018
bdda84b
Update install4j gradle plugin from 7.0.7 -> 7.0.8
LinusDietz Oct 23, 2018
a071ca6
Add exception for the gradle build scan plugin
LinusDietz Oct 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions build.gradle
View file
Open in desktop
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