diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 933792cb..0ba77426 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -11,15 +11,13 @@
-
-
-
+
+
+
-
-
+
@@ -62,8 +60,7 @@
-
+
@@ -89,14 +86,9 @@
-
+
-
-
-
-
-
-
+
@@ -105,8 +97,7 @@
-
+
@@ -153,11 +144,6 @@
-
-
-
-
-
@@ -175,7 +161,7 @@
-
+
@@ -215,9 +201,8 @@
-
-
+
+
@@ -245,21 +230,11 @@
-
+
-
-
-
-
-
-
-
-
-
@@ -7543,10 +7518,9 @@
-
-
-
+
+
+
@@ -8464,78 +8438,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -9467,14 +9369,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -11654,30 +11554,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -13558,9 +13453,9 @@
-
-
-
+
+
+
diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh
index 6000319f..87570082 100755
--- a/scripts/analysis/analysis-wrapper.sh
+++ b/scripts/analysis/analysis-wrapper.sh
@@ -29,15 +29,14 @@ 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
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 +46,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