From b05b8d9387d09726cf2356b536326148776cab4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 10:34:58 +0000 Subject: [PATCH 1/5] fix(deps): update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v6.0.8 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2b0e1fce57..69572c2258 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ buildscript { classpath 'com.android.tools.build:gradle:8.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}" - classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.7' + classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.8' classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.5" classpath "org.jlleitschuh.gradle:ktlint-gradle:12.1.0" From 3c8019790881e1f9fd277405ab508fa51007650d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 14:20:36 +0100 Subject: [PATCH 2/5] Update classes path for spotbugs to pick up Signed-off-by: Andy Scherzinger --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index e344e35892..7d16862718 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -338,7 +338,7 @@ tasks.withType(SpotBugsTask).configureEach { task -> dependsOn "compile${variantNameCap}Sources" excludeFilter = file("${project.rootDir}/spotbugs-filter.xml") - classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/classes/") + classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/compile${variantNameCap}JavaWithJavac/classes/") reports { xml { required = true From 504653b7dab0b9f7ff1475f684f8d3b491620d5f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 14:21:42 +0100 Subject: [PATCH 3/5] Make spotbugs more chatty console output wise Signed-off-by: Andy Scherzinger --- scripts/analysis/spotbugs-up.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/spotbugs-up.rb b/scripts/analysis/spotbugs-up.rb index ed046c4111..abb053f9c9 100755 --- a/scripts/analysis/spotbugs-up.rb +++ b/scripts/analysis/spotbugs-up.rb @@ -15,7 +15,7 @@ # run Spotbugs puts "running Spotbugs..." -system './gradlew spotbugsGplayDebug 1>/dev/null 2>&1' +system './gradlew spotbugsGplayDebug' # find number of warnings current_warning_count = `./scripts/analysis/spotbugsSummary.py --total`.to_i From a9cbb657ee4f2a33b46ac364109a5ee52f13f7d1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 18:05:32 +0100 Subject: [PATCH 4/5] fix comment Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/utils/ConversationUtils.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/ConversationUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ConversationUtils.kt index 92dea95def..0c48e0ede4 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ConversationUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ConversationUtils.kt @@ -1,10 +1,3 @@ -package com.nextcloud.talk.utils - -import com.nextcloud.talk.models.domain.ConversationModel -import com.nextcloud.talk.models.domain.ConversationType -import com.nextcloud.talk.models.domain.ParticipantType -import com.nextcloud.talk.models.json.capabilities.SpreedCapability - /* * Nextcloud Talk application * @author Marcel Hibbe @@ -23,6 +16,12 @@ import com.nextcloud.talk.models.json.capabilities.SpreedCapability * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +package com.nextcloud.talk.utils + +import com.nextcloud.talk.models.domain.ConversationModel +import com.nextcloud.talk.models.domain.ConversationType +import com.nextcloud.talk.models.domain.ParticipantType +import com.nextcloud.talk.models.json.capabilities.SpreedCapability object ConversationUtils { private val TAG = ConversationUtils::class.java.simpleName From 060da3f8da8c5be99be2f0246953f752bfe2efdb Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 1 Mar 2024 18:05:42 +0100 Subject: [PATCH 5/5] Bump scoring Signed-off-by: Andy Scherzinger --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 19f1c33c2b..f93f51206f 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: 8 errors and 79 warnings + Lint Report: 10 errors and 81 warnings