diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 82ba7beb..d1f80720 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -223,6 +223,7 @@
+
@@ -7586,6 +7587,11 @@
+
+
+
+
+
@@ -8634,14 +8640,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -11800,6 +11806,14 @@
+
+
+
+
+
+
+
+
diff --git a/lib/build.gradle b/lib/build.gradle
index efa9f1bf..94a11c02 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -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"
diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh
index 6000319f..e13cd48a 100755
--- a/scripts/analysis/analysis-wrapper.sh
+++ b/scripts/analysis/analysis-wrapper.sh
@@ -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("Codacy.*"))) | .id')
@@ -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="SpotBugs
$(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="SpotBugs
$(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="SpotBugs increased!
"
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.
"
fi
diff --git a/scripts/analysis/spotbugs-up.rb b/scripts/analysis/spotbugs-up.rb
index 77827dc0..e2faa3db 100644
--- a/scripts/analysis/spotbugs-up.rb
+++ b/scripts/analysis/spotbugs-up.rb
@@ -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