diff --git a/app/build.gradle b/app/build.gradle index ce9dfc1fe3..4a91adf7fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -384,7 +384,7 @@ dependencies { gplayImplementation "com.google.firebase:firebase-messaging:23.2.1" gplayImplementation 'com.google.android.play:review-ktx:2.0.1' - implementation 'com.github.nextcloud.android-common:ui:0.13.0' + implementation 'com.github.nextcloud.android-common:ui:0.14.0' implementation "androidx.room:room-runtime:$roomVersion" ksp "androidx.room:room-compiler:$roomVersion" diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 0817adfc9e..07b1a18f2f 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -5418,6 +5418,52 @@ Zm7SPjIW+sWOab+FF35lQTVGS3U/EUoTCTsHpgSY1JMn =uDN6 -----END PGP PUBLIC KEY BLOCK----- +pub 3D12CA2AC19F3181 +uid Tatu Saloranta (cowtowncoder) + +sub 575D6C921D84AC76 +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +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 +96Um/Inf +=ec6I +-----END PGP PUBLIC KEY BLOCK----- + pub 3F00DB67AE236E2E uid Pete Bentley @@ -5873,6 +5919,28 @@ jEnSczTCmOHRZ3ed9ef6SeWUozYCQAX/tAbpoCthe0lTDYhFhkzVCe/FABEBAAE= =45ZY -----END PGP PUBLIC KEY BLOCK----- +pub 56E73BA9A0B592D0 +uid ASF Logging Services RM + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +mQINBGO9IPgBEADHCB2evKGSjQutTtIjODtaYUoU634Tl4Iv4DYsOR+MyOQBJ3Eo +9okST4azX6r9Fspgmc4LxpFnGm9OSEGn4NZ9ZxiTrmKaGsoXzj2w4JKtgAip4F5h +o9Ai/ridqeA7V9VH31OLSyZ/YJvrcoBcxWdwcpydxchlKQOOYX6wKqGk0BO38870 +sI1d0y1W9pC9AiL+z7qaX3WUslOFDCGxRSxZs57x28P4pkRy0HwUWn38TrS4fnA5 +XfWuxXWr2K8/xtf+Uf2EGVUP+qiv7kDdKYbZj+SeF4ba8nLPcuFmnz6Q1iZUhA9s +sTfruyibtm7htngt1IHFy7DT35GrIbE6D7W7S3ANqg/K+Gc/j9JXKjOwx8AM/WI0 +WQ5w4fSn3C6WhFTMpyq445c97+5ki/SKbFP45oWd7A9JqIMttMqZLzOSzFM4230J +Cd6FQTGJdtcgfruwltQOUWl4IaCOsCAzI0XnxTIdsaCDDQ6+KspvdFw7zav03eVN +TguQ39IkZgke2Am2He5vtxXAayv/qiTKsyTUxIIDe1ZTS5j3MJ+SNWR0faXvvDaV +QgqVjsB9U/CHjcCYbmFhKxk2phGwa0Wc+NHKwyVwjhJkFo+U+XDGJaT2RbhDYD1H +LeoZAT6kdngSzr2WvXWs6xJbWIXJc5FivUorfkhaiaBWam1R4o+8kSuxSwARAQAB +tDRBU0YgTG9nZ2luZyBTZXJ2aWNlcyBSTSA8cHJpdmF0ZUBsb2dnaW5nLmFwYWNo +ZS5vcmc+ +=DAIw +-----END PGP PUBLIC KEY BLOCK----- + pub 571A5291E827E1C7 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: BCPG v1.68 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 94c9528e6e..6c59c93980 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -23,6 +23,7 @@ + @@ -57,6 +58,7 @@ + @@ -292,6 +294,11 @@ + + + + + @@ -761,6 +768,11 @@ + + + + + @@ -3015,6 +3027,14 @@ + + + + + + + + @@ -3023,6 +3043,14 @@ + + + + + + + + @@ -3031,6 +3059,14 @@ + + + + + + + + @@ -3193,6 +3229,14 @@ + + + + + + + + diff --git a/scripts/analysis/spotbugs-up.rb b/scripts/analysis/spotbugs-up.rb index ed046c4111..abb053f9c9 100644 --- a/scripts/analysis/spotbugs-up.rb +++ b/scripts/analysis/spotbugs-up.rb @@ -15,7 +15,7 @@ require 'open3' # 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