diff --git a/app/build.gradle b/app/build.gradle index eed209073..4f33745d5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -137,7 +137,7 @@ android { ignoreFailures = false effort = "max" reportLevel = "medium" - classes = fileTree("$project.buildDir/intermediates/classes/gplay/debug/com/nextcloud") + classes = fileTree("$project.buildDir/intermediates/javac/gplayDebug/classes/com/nextcloud") excludeFilter = file("${project.rootDir}/findbugs-filter.xml") source = fileTree('src/main/java') pluginClasspath = project.configurations.findbugsPlugins @@ -339,4 +339,4 @@ dependencies { findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' implementation 'com.github.Kennyc1012:BottomSheet:2.4.1' -} \ No newline at end of file +} diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index d8fce50c5..3c4a8e5a7 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -37,7 +37,7 @@ else 6="master-"$(date +%F) fi echo "New lint results at https://www.kaminsky.me/nc-dev/talk-lint/$6.html" - curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-droneLogs/$6.html --upload-file app/build/reports/lint/lint.html + curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-lint/$6.html --upload-file app/build/reports/lint/lint.html echo "New findbugs results at https://www.kaminsky.me/nc-dev/talk-findbugs/$6.html" curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-findbugs/$6.html --upload-file app/build/reports/findbugs/findbugs.html @@ -57,7 +57,7 @@ else lintWarningOld=$(grep "[0-9]* warning" scripts/analysis/lint-results.txt -o | cut -f1 -d" ") lintResult="

Lint

TypeMasterPR
Warnings"$lintWarningOld""$lintWarningNew"
Errors"$lintErrorOld""$lintErrorNew"
" findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/findbugs/findbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#FindBugs (new)#" | tr "\"" "\'" | tr -d "\n") - findbugsResultOld=$(curl 2>/dev/null https://nextcloud.kaminsky.me/index.php/s/YCD729NgcMAYkJT/download | tr "\"" "\'" | tr -d "\r\n" | sed s'#FindBugs#FindBugs#'| tr "\"" "\'" | tr -d "\n") + findbugsResultOld=$(curl 2>/dev/null https://nextcloud.kaminsky.me/s/oaof9LtJHibyRGx/download | tr "\"" "\'" | tr -d "\r\n" | sed s'#FindBugs#FindBugs#'| tr "\"" "\'" | tr -d "\n") curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$lintResult $findbugsResultNew $findbugsResultOld \" }" if [ $lintValue -eq 2 ]; then diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 597074d4d..a6a87a15d 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 1 error and 90 warnings + Lint Report: 90 error and 238 warnings diff --git a/scripts/analysis/lint-up.rb b/scripts/analysis/lint-up.rb index 621c527ff..46c35ae53 100644 --- a/scripts/analysis/lint-up.rb +++ b/scripts/analysis/lint-up.rb @@ -56,7 +56,7 @@ end # run Lint puts "running Lint..." -system './gradlew clean assembleGplay lint' +system './gradlew clean assembleGplay app:lint' # confirm that Lint ran w/out error result = $?.to_i