Skip to content

Update to Gradle 5.6 #433

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

Merged
nedtwigg merged 6 commits into from
Aug 19, 2019
Merged

Update to Gradle 5.6 #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7891d3
Gradle 5.6
ZacSweers Aug 15, 2019
70cc89d
Remove guava classpath, use conventional spotbugs plugin decl
ZacSweers Aug 15, 2019
0259b49
Remove old spotbugs classpath setup in java-setup.gradle
ZacSweers Aug 19, 2019
393238f
Extract class lookup due to Groovy type resolution with no buildscript
ZacSweers Aug 19, 2019
229b38c
Disable some caching as a workaround for #429
nedtwigg Aug 19, 2019
abbcf65
Don't cache the ~/.gradle/wrapper folder
nedtwigg Aug 19, 2019
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
9 changes: 5 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ before_install:
install: true
script:
- ./.ci/ci.sh
# lines commented out below are a temporary workaround for https://github.com/diffplug/spotless/issues/429
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
# - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
# - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
- rm -fr plugin-maven/build/localMavenRepository/com/diffplug/spotless/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
# - $HOME/.gradle/caches/
# - $HOME/.gradle/wrapper/
- $HOME/.m2/
- plugin-maven/build/localMavenRepository/
18 changes: 6 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
buildscript {
repositories {
maven {
url 'https://plugins.gradle.org/m2/'
}
}
dependencies {
classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:${VER_SPOTBUGS_PLUGIN}"
classpath "com.google.guava:guava:27.1-jre" // Force newer version for spotbugs
}
}

plugins {
// dependencyUpdates https://github.com/ben-manes/gradle-versions-plugin/releases
id 'com.github.ben-manes.versions' version '0.22.0'
Expand All @@ -25,6 +13,8 @@ plugins {
id 'org.jdrupes.mdoclet' version '1.0.5' apply false
// https://github.com/ajoberstar/gradle-git-publish/releases
id 'org.ajoberstar.git-publish' version '2.1.1' apply false
// https://github.com/spotbugs/spotbugs/releases
id "com.github.spotbugs" version "2.0.0" apply false
}

buildScan {
Expand All @@ -44,3 +34,7 @@ eclipseResourceFilters {
exclude().folders().name('plugin-maven')
exclude().folders().name('testlib')
}

static Class<?> spotBugsTaskType() {
return com.github.spotbugs.SpotBugsTask
}
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ artifactIdGradle=spotless-plugin-gradle
# Build requirements
VER_JAVA=1.8
VER_SPOTBUGS=3.1.6
VER_SPOTBUGS_PLUGIN=2.0.0

# Used in multiple places
VER_DURIAN=1.2.0
Expand Down
11 changes: 1 addition & 10 deletions gradle/java-setup.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
buildscript {
repositories {
maven {
url 'https://plugins.gradle.org/m2/'
}
}
dependencies { classpath "gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:${VER_SPOTBUGS_PLUGIN}" }
}

//////////
// JAVA //
//////////
Expand Down Expand Up @@ -54,7 +45,7 @@ spotbugs {
omitVisitors = [] // bugs that we want to ignore
}
// HTML instead of XML
tasks.withType(com.github.spotbugs.SpotBugsTask) {
tasks.withType(spotBugsTaskType()) {
reports {
xml.enabled = false
html.enabled = true
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-5.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 19 additions & 3 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.