Merge pull request #12918 from nextcloud/update-library-2024-04-23

Update library
nextcloud · Apr 24, 2024 · 5a28f84 · 5a28f84
2 parents 9e10cd6 + 90b3958
commit 5a28f84
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -195,6 +195,7 @@ android {
     packagingOptions {
         resources {
             excludes += 'META-INF/LICENSE*'
+            excludes += 'META-INF/versions/9/OSGI-INF/MANIFEST*'
             pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies
         }
     }

diff --git a/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt b/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt
@@ -17,11 +17,12 @@ import org.junit.Test
 class CapabilityUtilsIT : AbstractIT() {
     @Test
     fun checkOutdatedWarning() {
+        assertFalse(test(NextcloudVersion.nextcloud_28))
         assertFalse(test(NextcloudVersion.nextcloud_27))
-        assertFalse(test(NextcloudVersion.nextcloud_26))
-        assertFalse(test(NextcloudVersion.nextcloud_25))
-        assertFalse(test(NextcloudVersion.nextcloud_24))
 
+        assertTrue(test(NextcloudVersion.nextcloud_26))
+        assertTrue(test(NextcloudVersion.nextcloud_25))
+        assertTrue(test(NextcloudVersion.nextcloud_24))
         assertTrue(test(NextcloudVersion.nextcloud_23))
         assertTrue(test(NextcloudVersion.nextcloud_22))
         assertTrue(test(NextcloudVersion.nextcloud_21))

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@
  */
 buildscript {
     ext {
-        androidLibraryVersion ="0c886d61f6"
+        androidLibraryVersion ="5fbc7d3a9bc9fd123ce9593cc500bb6415e797c6"
         androidPluginVersion = '8.3.2'
         androidxMediaVersion = '1.3.1'
         androidxTestVersion = "1.5.0"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -5172,6 +5172,14 @@
             <sha256 value="9f5dc2343cdf500b2cc17756418fce0506d13ef480ab8276cda415950e795991" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="5fbc7d3a9bc9fd123ce9593cc500bb6415e797c6">
+         <artifact name="android-library-5fbc7d3a9bc9fd123ce9593cc500bb6415e797c6.aar">
+            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-5fbc7d3a9bc9fd123ce9593cc500bb6415e797c6.module">
+            <sha256 value="1bf1482df26848a59743a94ea6ee53d4ef6f014af5a21274214ab62eb2c6a8d6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="6dcffdb0ba">
          <artifact name="android-library-6dcffdb0ba.aar">
             <sha256 value="00e121d803e9258b36cb2d6e20904552c9e88dbff6b193b3b9adc0fcd224959a" origin="Generated by Gradle" reason="Artifact is not signed"/>