Merge pull request #3683 from nextcloud/renovate/com.github.spotbugs.…

…snom-spotbugs-gradle-plugin-6.x fix(deps): update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v6.0.8
nextcloud · Mar 1, 2024 · 1262a75 · 1262a75
2 parents 9c2f017 + 060da3f
commit 1262a75
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git 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

diff --git 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 <http://www.gnu.org/licenses/>.
  */
+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

diff --git 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"
 

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 8 errors and 79 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 10 errors and 81 warnings</span>
diff --git 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