Merge pull request #2109 from nextcloud/chore/noid/bumpCommons220

Bump com.github.stefan-niedermann.nextcloud-commons to 2.2.0
2024-11-28 11:29:01 +03:00 · 2024-04-03 09:22:35 +02:00 · 2024-04-03 09:22:35 +02:00 · 679171cdd4
commit 679171cdd4
parent fd799f565f aa4f36421e
4 changed files with 117 additions and 5 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -92,7 +92,7 @@ dependencies {
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'

    // Nextcloud SSO
-    implementation 'com.github.nextcloud.android-common:ui:0.18.0'
+    implementation 'com.github.nextcloud.android-common:ui:0.19.0'
    implementation 'com.github.nextcloud:Android-SingleSignOn:1.1.0'
    implementation 'com.github.stefan-niedermann:android-commons:1.0.0'
    implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion"
--- a/build.gradle
+++ b/build.gradle
@ -14,7 +14,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 buildscript {
    ext {
        kotlinVersion = '1.9.23'
-        commonsVersion = '2.1.0'
+        commonsVersion = '2.2.0'
    }
    repositories {
        mavenCentral()
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@ -829,6 +829,43 @@ XjYxnM4pLyU=
 =QmNQ
 -----END PGP PUBLIC KEY BLOCK-----

+pub    C730DCAEF653215C
+uid    Yoshito Umaoka <yoshito_umaoka@us.ibm.com>
+
+sub    96123FA2B8E17FF9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQGNBGU//oQBDADDJ42aKLuJyYL2ZfG0ob/XxdYRZhP7/OO64Jf4WJtX7vgoVUif
+iSytAikRT707EshXRMtw8tx3H/jM2O7o/gJl592IQ2gYppMh4boNO7lc7dd9F6gv
+MjXVycQdSVlvHExRSxi7bvchHTcRakQzUHUYwm/zBo22qM+Q5BKmBNA/rwXN7Onh
+e2ahZcCffh0dGN/kdV35cz8XXeApH9IglLKdnynSHmKld71+75GwQgAbD7AbhGM+
+Xy7a3Kj02653H9oyUS8vntIcImqFiPI4KN4bYLDekQKFJbxVLt1b4s2goAjOFrWz
+hfyzUIBbaX6gMJCN2H9LaM2MfhkP0t/Sz0qArU0Kd9om0+c35tL9KD/bPZgxJbBd
+kF54+mvXtCxCIV8tzSit9t5efrrpnan9LYtbeSc1EVdgobrwZYtHXLtM2zz9dyYn
+ar/bE5fieRtpkyIJwDSNOeh3i4mZHcMp13ISzic4lwidpmmU8zhJ5wjMlVAp3R9h
+Cle8WCMJqHrgio0AEQEAAbQqWW9zaGl0byBVbWFva2EgPHlvc2hpdG9fdW1hb2th
+QHVzLmlibS5jb20+uQGNBGU//oQBDAC9XdL5EPXSCy+sLBhruNrIfHttlLerjWnC
+1/aPPo27+OaCT9AXzLzEloxud0LXoTmy+Zwib8XxbqtZ90X0l5ecQR7wMbZRa638
+GX0yi3xYWd5EKQ2P62WRQ717up1yWmmv3uQr5hKLJmjRNjSNPLgiHil1pl9u7H0r
+ZoNFdx572ImeriQovUKw0iGsT/bYyTavEQ6/mtlKkA2WEQ7Jt6XlFlTViXAABfkh
+cI25iop38/S06GWu1xM76YmbGlD9fVfH4P+xAwuFLCLRfyxwmackiyX/OuhgNalf
+jlmt8sdpj33xTlmqrY46B+Z0QDBFPFlvau9NRn3Eh1u9N9ef/ByM+gFOkJj2raU/
+4MI92t+geayE1yHiCiZv5Xk8v0gASAlpXeK4yFwXnmkPSEMhkiCxczz2KKmINzP6
+LLuSWmVQxHKFE9BPbhL2inxVNYvinRYkG8uh4jLEeF72ym0fZFCQk3t47hqgn75
+eKlmUlKa7ei/AHV8qH/lvIcQYIFmVWMAEQEAAYkBvAQYAQoAJhYhBIfftuAJsnym
+IrkgTscw3K72UyFcBQJlP/6EAhsMBQkDwmcAAAoJEMcw3K72UyFcDg4MAL/IV5pA
+pZ3dz3GbLe4vt/E9VQJPhLJGXMm0YJtscJsGwXYp/3eRsdoGH56oesjDfaxZmfA5
+iD3+CRf7kqLJxAu0JjrAiVZ/uP09VSqhR45fiSQyC2+Eft/dBaIDlL16Ud5l7YAE
+RWK9oUfkrOwG+7qxJreaEk8Tb0LMNc+ToFPiuNB9oDyk/4lZHhjQ6m9QqYf6/4+v
+0Pi4vBQ8J+18Lamhbqq2XBb9gIoCI3D/fQ9HgVPRHACOJ+NSE1rCtkEj6aNQYYNy
+QByfIPSHIGMfnnTUGCFniu1dF9SPAaHKcJka02vNwQ7MV+aE35tttSMli3SprQG9
+Ji2wzTj33pQ0SGMlTkslK7aamiA9hUdnWv51upy3Hzzi7M3yt+LTboXwtYm/+S7R
+SfmD05/nBjXCauGN1FXe4fJ4bGtMugyqaIk9+6wXhmuIPFUoLVRHrfKiCC3Pr3ku
+576va2U91RqmLROBIJIBaUwzmHPdGvXQx+tS5uSh8JMsdBiHZMdHExB2jA==
+=q7LN
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    C92C5FEC70161C62
 uid    Herve Boutemy <hboutemy@apache.org>

--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@ -7,9 +7,6 @@
         <trust group="com.android.tools.build" name="aapt2" version="8.3.1-10880808" reason="ships OS specific artifacts (win/linux) - temp global trust"/>
         <trust file=".*-sources[.]jar" regex="true" reason="Android Studio downloads source jars but doesn't add checksums - fixes building in AS"/>
      </trusted-artifacts>
-      <ignored-keys>
-         <ignored-key id="C730DCAEF653215C" reason="Key couldn't be downloaded from any key server"/>
-      </ignored-keys>
      <trusted-keys>
         <trusted-key id="04543577D6A9CC626239C50C7ECBD740FF06AEB5">
            <trusting group="org.glassfish.jaxb"/>
@ -97,6 +94,7 @@
            <trusting group="org.codehaus.mojo"/>
         </trusted-key>
         <trusted-key id="8756C4F765C9AC3CB6B85D62379CE192D401AB61" group="org.jetbrains.intellij.deps" name="trove4j" version="1.0.20200330"/>
+         <trusted-key id="87DFB6E009B27CA622B9204EC730DCAEF653215C" group="com.ibm.icu"/>
         <trusted-key id="90EE19787A7BCF6FD37A1E9180C08B1C29100955" group="^com[.]squareup($|([.].*))" regex="true"/>
         <trusted-key id="95115197C5227C0887299D000F9FE62F88E938D8">
            <trusting group="com.google.dagger" name="dagger" version="2.50"/>
@ -324,6 +322,11 @@
            <sha256 value="9bfe92a8fa26491d64fc4c94621a8bdd0f61375fb815515236204503ec7cae6b" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="androidx.compose" name="compose-bom" version="2024.03.00">
+         <artifact name="compose-bom-2024.03.00.pom">
+            <sha256 value="0ded689471b380235557750d190764387421f99c1477320b7a60a34e5df8961e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="androidx.concurrent" name="concurrent-futures" version="1.0.0">
         <artifact name="concurrent-futures-1.0.0.pom">
            <sha256 value="4505b9a5e30a9418b59a9ad6702c3e4193aea6e691a3d03cf220c7640ad083e2" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2034,6 +2037,14 @@
            <sha256 value="5e29fecff21ceec7c5652fa048367b04b882f3c836d853dc28b736896ee5a940" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.nextcloud" name="android-common" version="0.19.0">
+         <artifact name="android-common-0.19.0.jar">
+            <sha256 value="c5393011fb32d1690b91c1e88a1f6272d48338d6f8a13391f48713d93843bb8d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-common-0.19.0.pom">
+            <sha256 value="35f97685fd9d25858aa94ee345842001a656d17c2bf9cf2e5563edf8938afb65" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.nextcloud.android-common" name="core" version="0.14.0">
         <artifact name="core-0.14.0.aar">
            <sha256 value="d370010eeae5928f525f31c09e33f9c78ed5e610af4b9f84b1ba68ce0727267b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2074,6 +2085,14 @@
            <sha256 value="1e92c76d638cb275a3f9432641a0c5664b1eaabcc2da67bd809e787c3371fca5" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.nextcloud.android-common" name="core" version="0.19.0">
+         <artifact name="core-0.19.0.aar">
+            <sha256 value="6df9110e5ab50846414102cc75d541fcb488d36a10b7c8b6c12908c344ad3a82" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-0.19.0.module">
+            <sha256 value="75720846f43db09969f1dc73a137b4354de91d4aa57d1e5e7900db7052c75325" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.14.0">
         <artifact name="material-color-utilities-0.14.0.jar">
            <sha256 value="bfcd5205b056b948bc6ff9a556898188f4a4e92179c723906e10f1164b776eed" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2114,6 +2133,14 @@
            <sha256 value="708823ec85484322da28afa177689bc2adadf0d88f766407328353e0c755e63b" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.19.0">
+         <artifact name="material-color-utilities-0.19.0.jar">
+            <sha256 value="a683598a6340970da53a8b78ecdfbf83a54d691c1cb71a9cc09c1f2c15682c8c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="material-color-utilities-0.19.0.module">
+            <sha256 value="887711f92659376957ed64d8ac5acdd8f6519af458405ae0c890f01393135809" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.nextcloud.android-common" name="ui" version="0.14.0">
         <artifact name="ui-0.14.0.aar">
            <sha256 value="2ff1b8ca1ce4d4151ce967c4704a4def19a128d3f710491872e007217f3ac84f" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2154,6 +2181,14 @@
            <sha256 value="abbece3fec4a3a1b706401b26e10d0290ac394d04d89343d32da682527579846" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.nextcloud.android-common" name="ui" version="0.19.0">
+         <artifact name="ui-0.19.0.aar">
+            <sha256 value="7d900a930d7ad1f7de91177b8b661abef13deef032493cee99fe9842f85bcf16" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-0.19.0.module">
+            <sha256 value="8ec5f68934193c31c3bcea7beb96b5837c0294fecce91978ff51c67d07d8c2f7" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.stefan-niedermann" name="android-commons" version="1.0.0">
         <artifact name="android-commons-1.0.0.jar">
            <sha256 value="670f84d9ef31964f1b548204d83c81a44142106c69d4188b20556bc32f4ee3dc" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2202,6 +2237,14 @@
            <sha256 value="6f2f4a71a7bff2ff6e6e51c6897b528d49cd897b3cb15200b798c95d6f60a5c8" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="exception" version="2.2.0">
+         <artifact name="exception-2.2.0.aar">
+            <sha256 value="819c72bf825e650fbd39abc959f43a8a2809f0c45d9dce717ebbfc727e79f9f8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="exception-2.2.0.module">
+            <sha256 value="c17dada818fd40202cb5e97791b2a9855548ed71d9fc960c758572ef7833fcd3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.stefan-niedermann.nextcloud-commons" name="markdown" version="2.1.0">
         <artifact name="markdown-2.1.0.aar">
            <sha256 value="588884e84e263e5a50b77cbb58eb06c2a48b73251195834b30659dfd18306153" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2210,6 +2253,14 @@
            <sha256 value="b6aec350ef186d40afc2c30ede8b09c9a3e34b5e445d5590caf7d5626927689e" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="markdown" version="2.2.0">
+         <artifact name="markdown-2.2.0.aar">
+            <sha256 value="6d2df6751dc0c8347fca0090ef65d6c2f100c1463d8e607b596c1cf3e8b4b1cf" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="markdown-2.2.0.module">
+            <sha256 value="6c670566039d7248b7bb6a40f0897dedc46bc418d92d0a85260cb8dd6a691575" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.stefan-niedermann.nextcloud-commons" name="ocs" version="2.1.0">
         <artifact name="ocs-2.1.0.aar">
            <sha256 value="31f33b84bf0cbd1607dcbeffcd9ef52297e2d5c5a090e4e0992de16dc70f1589" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2218,6 +2269,14 @@
            <sha256 value="d179c8891dd99aae2c2853b9da3e09fa58d7f1b271217749e1a1d340fc60d240" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="ocs" version="2.2.0">
+         <artifact name="ocs-2.2.0.aar">
+            <sha256 value="31f33b84bf0cbd1607dcbeffcd9ef52297e2d5c5a090e4e0992de16dc70f1589" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="ocs-2.2.0.module">
+            <sha256 value="76f936e81d09745535bfdad8e45121354dba26c066214a8f8331cf9c9c3a51e3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-glide" version="2.1.0">
         <artifact name="sso-glide-2.1.0.aar">
            <sha256 value="8fb3d57f5878ae3ae3124dc541e717ba205830999c87bdc9a8ffd56df2152fba" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2226,6 +2285,14 @@
            <sha256 value="8b7272d8db625c69cc37bfafc1daf4819601a5ceb685f68ef7396afa58f9b47b" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-glide" version="2.2.0">
+         <artifact name="sso-glide-2.2.0.aar">
+            <sha256 value="8fb3d57f5878ae3ae3124dc541e717ba205830999c87bdc9a8ffd56df2152fba" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="sso-glide-2.2.0.module">
+            <sha256 value="ccec14fcfbe9079a4fee3a5c854758651cccf9f9e3c16e987404d3ae84533ceb" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-url-helper" version="2.1.0">
         <artifact name="sso-url-helper-2.1.0.aar">
            <sha256 value="6309e518b9637af17748b03d42f0306780bcd0c09d3ed338341b5a502d19292a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2234,6 +2301,14 @@
            <sha256 value="9c080d01b46159d534764701fbd35da67c091d75253491d17b21947d4ca187c8" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="com.github.stefan-niedermann.nextcloud-commons" name="sso-url-helper" version="2.2.0">
+         <artifact name="sso-url-helper-2.2.0.aar">
+            <sha256 value="6309e518b9637af17748b03d42f0306780bcd0c09d3ed338341b5a502d19292a" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="sso-url-helper-2.2.0.module">
+            <sha256 value="f03245adc0fb328d29a9868abbe97d8a461ced74295a5b668e5e6fa1b2e05a79" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.google.android.flexbox" name="flexbox" version="3.0.0">
         <artifact name="flexbox-3.0.0.aar">
            <sha256 value="5e19500486fd7c8e2e8c7aad6bbba9c8d0ada7057c6b32b9b5c61439814e7574" origin="Generated by Gradle" reason="Artifact is not signed"/>