Skip to content

chore(deps): update plugin com.diffplug.spotless to v8.4.0 #963

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
tobiasKaminsky merged 2 commits into from
Apr 8, 2026
Merged

chore(deps): update plugin com.diffplug.spotless to v8.4.0 #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3e6bba
chore(deps): update plugin com.diffplug.spotless to v8.4.0
renovate[bot] Apr 1, 2026
237a4de
fix library path
tobiasKaminsky Apr 8, 2026
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
30 changes: 22 additions & 8 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@
<trusted-key id="9E3044071B758EBCB7E45673700E4F39BC05364B">
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.200"/>
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.0"/>
<trusting group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.100"/>
</trusted-key>
<trusted-key id="A31DDE881C3E3C4C985BD0D02C7F998F4272C851" group="com.diffplug.spotless"/>
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA">
Expand Down Expand Up @@ -7586,6 +7587,11 @@
<sha256 value="b8e8cfb8032c42713be9f710bcafff00c0cf672b0f62fabed2f1acfd5d42baaf" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="8.4.0">
<artifact name="com.diffplug.spotless.gradle.plugin-8.4.0.pom">
<sha256 value="a891aa8be64267621505beae63a8de02a180097dcf3bfc27059dfc6f9d74a440" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.fasterxml" name="oss-parent" version="56">
<artifact name="oss-parent-56.pom">
<sha256 value="fd491f78857424106d2e3d605bcd799b53d31a565cdc868463ca7e875db45a50" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
Expand Down Expand Up @@ -8634,14 +8640,14 @@
<sha256 value="02503912009e6d5b9e2fe589982c367e5133fb9cdeabe5751681cb2362ec3af7" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.7.4">
<artifact name="fb-contrib-7.7.4.jar">
<sha256 value="c2c147bc12e9a4c32ad3e940d8a63e7ac1c9da5bb7e800a3a8b9f118e4d67ef2" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
<artifact name="fb-contrib-7.7.4.pom">
<sha256 value="081ba1e6fc8effbf5b92175da929feb8a312a1f9236ea2a79302715863f2d6e4" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="com.mebigfatguy.fb-contrib" name="fb-contrib" version="7.7.4">
<artifact name="fb-contrib-7.7.4.jar">
<sha256 value="c2c147bc12e9a4c32ad3e940d8a63e7ac1c9da5bb7e800a3a8b9f118e4d67ef2" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
<artifact name="fb-contrib-7.7.4.pom">
<sha256 value="081ba1e6fc8effbf5b92175da929feb8a312a1f9236ea2a79302715863f2d6e4" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="com.pinterest" name="ktlint" version="0.51.0-FINAL">
<artifact name="ktlint-0.51.0-FINAL.pom">
<sha256 value="62609714173a8e0fc63ddb2990c8e1d261e0ff2eb10650f296d10f0a421b61a5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
Expand Down Expand Up @@ -11800,6 +11806,14 @@
<sha256 value="a24d9d906a478e126b219a9d24518b833b66da4b103f963e20b9050bebe2ae15" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.24.100">
<artifact name="org.eclipse.osgi-3.24.100.jar">
<sha256 value="d20f892030596fbc2c25da00acdbd2750f77cefd68136c33a3e279b8949867a8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
<artifact name="org.eclipse.osgi-3.24.100.pom">
<sha256 value="f94e22f5036629cc73ec0338d7e0b9c05c7683bd13678c166bca7f7c87e6fa81" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
<component group="org.glassfish.jaxb" name="jaxb-bom" version="2.3.2">
<artifact name="jaxb-bom-2.3.2.pom">
<sha256 value="a1018bb54678ed9f5acb2f7a4084e385ff510201f4e9dbf5f75dc6a675f66be7" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

plugins {
id "com.diffplug.spotless" version "8.3.0"
id "com.diffplug.spotless" version "8.4.0"
}

apply plugin: "kotlin-android"
Expand Down
12 changes: 6 additions & 6 deletions scripts/analysis/analysis-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ echo "Branch: $BRANCH"

if [ "$BRANCH" = $stableBranch ]; then
echo "New spotbugs result for $stableBranch at: https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.html"
curl -u "${LOG_USERNAME}:${LOG_PASSWORD}" -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.html --upload-file library/build/reports/spotbugs/spotbugs.html
curl 2>/dev/null -u "${LOG_USERNAME}:${LOG_PASSWORD}" -X PUT "https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.xml" --upload-file library/build/reports/spotbugs/debug.xml
curl -u "${LOG_USERNAME}:${LOG_PASSWORD}" -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.html --upload-file lib/build/reports/spotbugs/spotbugs.html
curl 2>/dev/null -u "${LOG_USERNAME}:${LOG_PASSWORD}" -X PUT "https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.xml" --upload-file lib/build/reports/spotbugs/debug.xml
else
if [ -e "${BUILD_NUMBER}" ]; then
6=$stableBranch"-"$(date +%F)
fi

echo "New spotbugs results at https://www.kaminsky.me/nc-dev/$repository-findbugs/${BUILD_NUMBER}.html"
curl 2>/dev/null -u "${LOG_USERNAME}:${LOG_PASSWORD}" -X PUT "https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/${BUILD_NUMBER}.html" --upload-file library/build/reports/spotbugs/spotbugs.html
curl 2>/dev/null -u "${LOG_USERNAME}:${LOG_PASSWORD}" -X PUT "https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/${BUILD_NUMBER}.html" --upload-file lib/build/reports/spotbugs/spotbugs.html

# delete all old comments, starting with Codacy
oldComments=$(curl_gh -X GET "https://api.github.com/repos/nextcloud/$repository/issues/${PR_NUMBER}/comments" | jq '.[] | select((.user.login | contains("github-actions")) and (.body | test("<h1>Codacy.*"))) | .id')
Expand All @@ -47,20 +47,20 @@ else
done

# spotbugs file must exist
if [ ! -s library/build/reports/spotbugs/spotbugs.html ] ; then
if [ ! -s lib/build/reports/spotbugs/spotbugs.html ] ; then
echo "spotbugs.html file is missing!"
exit 1
fi

# add comment with results
spotbugsResult="<h1>SpotBugs</h1>$(scripts/analysis/spotbugsComparison.py "/tmp/$stableBranch.xml" library/build/reports/spotbugs/debug.xml --link-new "https://www.kaminsky.me/nc-dev/$repository-findbugs/${BUILD_NUMBER}.html" --link-base "https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.html")"
spotbugsResult="<h1>SpotBugs</h1>$(scripts/analysis/spotbugsComparison.py "/tmp/$stableBranch.xml" lib/build/reports/spotbugs/debug.xml --link-new "https://www.kaminsky.me/nc-dev/$repository-findbugs/${BUILD_NUMBER}.html" --link-base "https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.html")"

if ( [ $spotbugsValue -eq 1 ] ) ; then
spotbugsMessage="<h1>SpotBugs increased!</h1>"
fi

# check for NotNull
if [[ $(grep org.jetbrains.annotations library/src/main/* -irl | wc -l) -gt 0 ]] ; then
if [[ $(grep org.jetbrains.annotations lib/src/main/* -irl | wc -l) -gt 0 ]] ; then
notNull="org.jetbrains.annotations.* is used. Please use androidx.annotation.* instead.<br><br>"
fi

Expand Down
2 changes: 1 addition & 1 deletion scripts/analysis/spotbugs-up.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
system './gradlew spotbugsDebug'

# find number of warnings
current_warning_count = `./scripts/analysis/spotbugsSummary.py --file library/build/reports/spotbugs/debug.xml --total`.to_i
current_warning_count = `./scripts/analysis/spotbugsSummary.py --file lib/build/reports/spotbugs/debug.xml --total`.to_i
puts "found warnings: " + current_warning_count.to_s

# get warning counts from target branch
Expand Down
Loading