diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Dependencies.kt | 8 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Versions.kt | 8 | ||||
| -rw-r--r-- | android/config/dependency-check-suppression.xml | 11 | ||||
| -rw-r--r-- | android/e2e/e2e-suppression.xml | 8 | ||||
| -rw-r--r-- | android/gradle/verification-metadata.xml | 264 | ||||
| -rwxr-xr-x | android/scripts/update-lockfile.sh | 19 |
6 files changed, 129 insertions, 189 deletions
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index a51613ffa4..777cea97bc 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -44,17 +44,19 @@ object Dependencies { object Compose { const val constrainLayout = "androidx.constraintlayout:constraintlayout-compose:${Versions.Compose.constrainLayout}" - const val foundation = "androidx.compose.foundation:foundation:${Versions.Compose.base}" + const val foundation = + "androidx.compose.foundation:foundation:${Versions.Compose.foundation}" const val junit = "androidx.compose.ui:ui-test-junit4:${Versions.Compose.base}" const val viewModelLifecycle = "androidx.lifecycle:lifecycle-viewmodel-compose:${Versions.Compose.viewModelLifecycle}" - const val material = "androidx.compose.material:material:${Versions.Compose.base}" + const val material = "androidx.compose.material:material:${Versions.Compose.material}" const val testManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}" const val uiController = "com.google.accompanist:accompanist-systemuicontroller:${Versions.Compose.uiController}" const val ui = "androidx.compose.ui:ui:${Versions.Compose.base}" const val uiTooling = "androidx.compose.ui:ui-tooling:${Versions.Compose.base}" - const val uiToolingPreview = "androidx.compose.ui:ui-tooling:${Versions.Compose.base}" + const val uiToolingPreview = + "androidx.compose.ui:ui-tooling-preview:${Versions.Compose.base}" } object Koin { diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index f748d079c9..9c9c731e86 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -37,10 +37,12 @@ object Versions { } object Compose { - const val base = "1.3.1" - const val viewModelLifecycle = "2.5.1" - const val uiController = "0.28.0" + const val base = "1.3.2" const val constrainLayout = "1.0.1" + const val foundation = "1.3.1" + const val material = "1.3.1" + const val uiController = "0.28.0" + const val viewModelLifecycle = "2.5.1" } object Plugin { diff --git a/android/config/dependency-check-suppression.xml b/android/config/dependency-check-suppression.xml index 590a2a5793..6c2b87af56 100644 --- a/android/config/dependency-check-suppression.xml +++ b/android/config/dependency-check-suppression.xml @@ -17,17 +17,6 @@ File name: protobuf-lite-3.0.1.jar ]]></notes> - <packageUrl regex="true">^pkg:maven/com\.google\.protobuf/protobuf\-javalite@.*$</packageUrl> - <cve>CVE-2022-3171</cve> - <cve>CVE-2022-3510</cve> - </suppress> - <suppress until="2023-05-01Z"> - <notes><![CDATA[ - This CVE only part of the debugAndroidTestRuntimeClasspath so suppressing in automatic - checks and tracking externally. - - File name: protobuf-lite-3.0.1.jar - ]]></notes> <packageUrl regex="true">^pkg:maven/com\.google\.protobuf/protobuf\-lite@.*$</packageUrl> <cve>CVE-2022-3171</cve> </suppress> diff --git a/android/e2e/e2e-suppression.xml b/android/e2e/e2e-suppression.xml index fcc7c35c01..29a69ad716 100644 --- a/android/e2e/e2e-suppression.xml +++ b/android/e2e/e2e-suppression.xml @@ -8,14 +8,6 @@ <notes><![CDATA[ This CVE is tracked externally and is therefore suppressed in the automatic audit checks. ]]></notes> - <packageUrl regex="true">^pkg:maven/com\.google\.protobuf/protobuf\-javalite@.*$</packageUrl> - <cve>CVE-2022-3171</cve> - <cve>CVE-2022-3510</cve> - </suppress> - <suppress until="2023-05-01Z"> - <notes><![CDATA[ - This CVE is tracked externally and is therefore suppressed in the automatic audit checks. - ]]></notes> <packageUrl regex="true">^pkg:maven/com\.google\.protobuf/protobuf\-java@.*$</packageUrl> <cve>CVE-2022-3171</cve> <cve>CVE-2022-3509</cve> diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index 569431df83..76746c563c 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -1,22 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + This is a lockfile for gradle dependencies. See the following page for more information: + https://docs.gradle.org/current/userguide/dependency_verification.html + + The easiest way to update this file is to run the following script: + <repository-root>/android/scripts/update-lockfile.sh + + The following trust group is only used for GitHub Actions: com.github.burrunan.multicache + + NOTE: + - In order to properly generate the components, no gradle caches should be present + (for example junit-bom-*). This is automatically handled by using the mentioned script. + For more information see: https://github.com/gradle/gradle/issues/19228 + - Comments after the verification-metadata opening tag will automatically be removed by gradle + when generating components. +--> <verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.1.xsd"> <configuration> <verify-metadata>true</verify-metadata> <verify-signatures>false</verify-signatures> <trusted-artifacts> + <trust group="com.github.burrunan.multicache"/> <trust file=".*-javadoc[.]jar" regex="true"/> <trust file=".*-sources[.]jar" regex="true"/> <trust file=".*[.]pom" regex="true"/> - <!-- Only used for GitHub Actions --> - <trust group="com.github.burrunan.multicache"/> </trusted-artifacts> </configuration> - <!-- - Below can be generated by running: ./gradlew -M sha256 help - NOTE: The command must be run without any gradle caches, otherwise some dependencies are not - properly included, for example junit-bom-*. For more information see: - https://github.com/gradle/gradle/issues/19228 - --> <components> <component group="androidx.activity" name="activity" version="1.2.0"> <artifact name="activity-1.2.0.aar"> @@ -162,12 +171,12 @@ <sha256 value="078b4dcd5f09689281415d9ea0e09d2775d80f016041dacbcee22d54c43a5fa1" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation" version="1.3.1"> - <artifact name="animation-1.3.1.aar"> - <sha256 value="2c37dcd22d18fa7934410d211ee65409ec90ba0a61dfd56eeb6fa6f69e7fecff" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation" version="1.3.2"> + <artifact name="animation-1.3.2.aar"> + <sha256 value="7c52b01c26c9ab8946d4cb6bbf819a54ac48038e1a3e741d30a6beac5457547f" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-1.3.1.module"> - <sha256 value="3d535100943a974f57c28847511a27df0e69d3399896208b7e1b0e36c88d8968" origin="Generated by Gradle"/> + <artifact name="animation-1.3.2.module"> + <sha256 value="5c6df3cc1976e39b9a056e1ea13a4d71418560b96706ec243bfac8e8a4c8d4ff" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation-core" version="1.0.0"> @@ -183,12 +192,12 @@ <sha256 value="6834b1b466930369a6cb9f76df6257eff28428e42ef42a26515319638cceee3d" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-core" version="1.3.1"> - <artifact name="animation-core-1.3.1.aar"> - <sha256 value="430bd0fb29a10b707abdf5750f4a28826ecf455838950c1cb86ce67ba91c6e16" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation-core" version="1.3.2"> + <artifact name="animation-core-1.3.2.aar"> + <sha256 value="68cd10277608095d2f365b31945b640815f8e98fb53a17b84dc85fe2e52a70cf" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-core-1.3.1.module"> - <sha256 value="0a2e30e890e9f26ec74febf195a4c4eb3c33a71b2b86e7cb4f1b3b201e1a44af" origin="Generated by Gradle"/> + <artifact name="animation-core-1.3.2.module"> + <sha256 value="2ab119f70bb561c04d2d4defc834b0a586477593a66130f82d2d43ad9bf7f18d" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.compiler" name="compiler" version="1.3.2"> @@ -253,35 +262,40 @@ </artifact> </component> <component group="androidx.compose.runtime" name="runtime" version="1.3.1"> - <artifact name="runtime-1.3.1.aar"> - <sha256 value="d6a8e8c7f33f2fff609d7798353e89a2b0f7046bee51eef60850c96a94dc1f61" origin="Generated by Gradle"/> - </artifact> <artifact name="runtime-1.3.1.module"> <sha256 value="4dd46221296f5d6695577eeb1cfbd58aae8374df6790b4c13bd9dd1b87c6f5ba" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-saveable" version="1.3.1"> - <artifact name="runtime-saveable-1.3.1.aar"> - <sha256 value="d8ade74ec0a26670ac0318da76e88e040735154041dc60d9bd047ea12a9d72d3" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime" version="1.3.2"> + <artifact name="runtime-1.3.2.aar"> + <sha256 value="359eec304ff1fc93c14cf501526299a2e4f889fc587897d4cfaf8ff1cc2982e0" origin="Generated by Gradle"/> + </artifact> + <artifact name="runtime-1.3.2.module"> + <sha256 value="ec43f7a93f496bb3a6ee53e153056d461b6ea0ad8ca545968a9418963a21aceb" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="androidx.compose.runtime" name="runtime-saveable" version="1.3.2"> + <artifact name="runtime-saveable-1.3.2.aar"> + <sha256 value="84d4de9262846d4a9d9833bba7714e1c216bba82b66b4ea537e267f0923602c1" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-saveable-1.3.1.module"> - <sha256 value="6b6819f2844418078b4b4462cb908a808ee3515a1ce4fc2a865c15022e8b1cbe" origin="Generated by Gradle"/> + <artifact name="runtime-saveable-1.3.2.module"> + <sha256 value="cfe43eb55e300f3b3a77f5952e5936d40a7b35ae52623225fd250377d488085a" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui" version="1.3.1"> - <artifact name="ui-1.3.1.aar"> - <sha256 value="736451f0b5de3fb34f18edb0796a53dfe68533c43170bf8da3b65ee25b53a59a" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui" version="1.3.2"> + <artifact name="ui-1.3.2.aar"> + <sha256 value="732a6fef1cbfb9dba981a7858ce2a6353db81ca8512a57f3c5cb1a3c0fde1d49" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-1.3.1.module"> - <sha256 value="ba79d53cd1b581ade9c96cbeba9fb7a57606c966130b38daa29013cfe1056e9f" origin="Generated by Gradle"/> + <artifact name="ui-1.3.2.module"> + <sha256 value="11bab2e362e566071ea08a3ca43f5ca52bf9f06045b48b2efb9ab7d28d30f83b" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-geometry" version="1.3.1"> - <artifact name="ui-geometry-1.3.1.aar"> - <sha256 value="fe64d954e848502f4ff8033e035a883be9fbe79ecdeb436dd31ec2a364593e29" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-geometry" version="1.3.2"> + <artifact name="ui-geometry-1.3.2.aar"> + <sha256 value="3e8cb09ee79aa0b257bc9a18f47dd5c640bce0e7e31301511017977340b9d5cb" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-geometry-1.3.1.module"> - <sha256 value="693bc211f48a57d88daedfbca4918f59db38ca41ad214e6cb6cfa23f1474f073" origin="Generated by Gradle"/> + <artifact name="ui-geometry-1.3.2.module"> + <sha256 value="ad2262144f81040a09bfdec039010dca2cb5026821e4b27403519303b59ae7bf" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-graphics" version="1.1.1"> @@ -289,36 +303,36 @@ <sha256 value="170b229a8012c6724b4101058dc4c2cfe0f11e78a34aac4a4627cce8888f1a59" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-graphics" version="1.3.1"> - <artifact name="ui-graphics-1.3.1.aar"> - <sha256 value="8b7facb7c1775adbbb4002962d7949c0b792789c7b456cecbdfc6d3e5cefc1bd" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-graphics" version="1.3.2"> + <artifact name="ui-graphics-1.3.2.aar"> + <sha256 value="0ea6df55f8340096476399573d9fe0dc5b357248edf99499c11019acef0bd3bf" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-graphics-1.3.1.module"> - <sha256 value="165d12037daa322191033a51647524b79460bfca6fca98b24150f10204c31fa7" origin="Generated by Gradle"/> + <artifact name="ui-graphics-1.3.2.module"> + <sha256 value="4be28cd46dd4db106df3b13bfea591e3cf1be64ff43ff8ce1df858ba103383e7" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test" version="1.3.1"> - <artifact name="ui-test-1.3.1.aar"> - <sha256 value="a8c9b9e488764409fe01c23f2ab895091808124691febc16a683f4aa88080f71" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test" version="1.3.2"> + <artifact name="ui-test-1.3.2.aar"> + <sha256 value="6089812de8446f1e4fe9831dfc41c20e6113ca09b35177e2834ce0c96bfcd6c0" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-1.3.1.module"> - <sha256 value="60d974a6d36507165cf67bee63bcf2f6c95e36b3ab26fd808a355575a944f0c5" origin="Generated by Gradle"/> + <artifact name="ui-test-1.3.2.module"> + <sha256 value="3b5381cea1866161647c4f05e9729e1a694cc14fcaa18acb01c3ea0fc9d62f05" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-junit4" version="1.3.1"> - <artifact name="ui-test-junit4-1.3.1.aar"> - <sha256 value="fd3798b1f5896a3f53e43aac6c5d9a7dbe5f30d0dd98b4efb008dc8dd6653d3f" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-junit4" version="1.3.2"> + <artifact name="ui-test-junit4-1.3.2.aar"> + <sha256 value="a9035193d518fde1e476d1fa8bfeb34bbe2272f4ebf7fe36f418af5c7b146182" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-junit4-1.3.1.module"> - <sha256 value="b259c1154576b33b08b290bb8e9577a48ff82abcff6e436d6b65eeb24812e2ba" origin="Generated by Gradle"/> + <artifact name="ui-test-junit4-1.3.2.module"> + <sha256 value="e655f5d0f63bdc2c80747e285e5c4c34f395075c6994ad75a4626c69ac217064" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-manifest" version="1.3.1"> - <artifact name="ui-test-manifest-1.3.1.aar"> - <sha256 value="b00bf6cb68bd52e78f191450fbb3e7ce4f744f0eed204a415640a93bf501f2ef" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-manifest" version="1.3.2"> + <artifact name="ui-test-manifest-1.3.2.aar"> + <sha256 value="4c12dbd3ba8703232fca2a1638bf6acc8524a2b1ffbf312a5b3e222838bc87b4" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-manifest-1.3.1.module"> - <sha256 value="8d8bf40d2c6fa4101088b72b049311e3040b6c7a0a99e77562e18f6deabb7a33" origin="Generated by Gradle"/> + <artifact name="ui-test-manifest-1.3.2.module"> + <sha256 value="ef45f1938e160ae42f4a764b5fc2327ce4ae4ffa9decd52621ebb29d878b97a5" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-text" version="1.0.0"> @@ -331,36 +345,36 @@ <sha256 value="1b74b6a3275e3bd794a21b6403247455cc3c3978ade66dba214035d9fbabab2d" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-text" version="1.3.1"> - <artifact name="ui-text-1.3.1.aar"> - <sha256 value="460d4b25f672f315ec58edc924e471ea574056afbe3570e538fdb9f2bd582276" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-text" version="1.3.2"> + <artifact name="ui-text-1.3.2.aar"> + <sha256 value="988fe4ea7f042ab83073a65a4448f2a0b8593b95b27d8708c41745af5aa10e00" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-text-1.3.1.module"> - <sha256 value="7808e6a9bb1ebd8b208b0ab3b206ddc5d4254ace63657d636b463b71983c54d3" origin="Generated by Gradle"/> + <artifact name="ui-text-1.3.2.module"> + <sha256 value="9934a053e86e4847f7bc3c60be46187c9834d7815c27f12a369905170fc08d3e" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling" version="1.3.1"> - <artifact name="ui-tooling-1.3.1.aar"> - <sha256 value="ff155931340e97653ce6c504e1bdb375c5c8e997fbcc3e5b55b34c8b062b4281" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling" version="1.3.2"> + <artifact name="ui-tooling-1.3.2.aar"> + <sha256 value="e9fcb88bb28ee67b2ef8d8d995ffd94caafbeb619a6cd09e391857867a17ce5b" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-1.3.1.module"> - <sha256 value="83d2c5ba7bbd2da6aa66eecb082b3dc15508c62dc909ce1ea49b3dc75094ec42" origin="Generated by Gradle"/> + <artifact name="ui-tooling-1.3.2.module"> + <sha256 value="5922f4576b36c7fa8be7d9d1d229376b20d5ef25a3410185e8562baad43d1788" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-data" version="1.3.1"> - <artifact name="ui-tooling-data-1.3.1.aar"> - <sha256 value="6eef09a9caf1349b01655bd58799632de3d8730b2117f974a86a38e2b67f7b7d" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-data" version="1.3.2"> + <artifact name="ui-tooling-data-1.3.2.aar"> + <sha256 value="a60c7c89e0461660b657c4502894266c089c10c017eee4e21078a31e46d9b6d8" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-data-1.3.1.module"> - <sha256 value="42dae94efa1d6beb2f41a0fb4ebcaddc7655e9cb89b5e38c092cb4e0449dddc9" origin="Generated by Gradle"/> + <artifact name="ui-tooling-data-1.3.2.module"> + <sha256 value="878534992097e9b3883cd47b6969553d0f2d1d89a13cd91bedca5b25dba0e04d" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.3.1"> - <artifact name="ui-tooling-preview-1.3.1.aar"> - <sha256 value="917299b91b2fb136394ab3c0a0fc1a2c0645bd074dbb57a5ea92869c0c25edac" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.3.2"> + <artifact name="ui-tooling-preview-1.3.2.aar"> + <sha256 value="6408b164c62c7b24e10f2538a2a20ca06f71f8f3daa45b749c1e4637a67690e4" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-preview-1.3.1.module"> - <sha256 value="339dbc146ba49ae4730db43af3b371c23e20dd955e9908333af198c24aa40d01" origin="Generated by Gradle"/> + <artifact name="ui-tooling-preview-1.3.2.module"> + <sha256 value="d8e758a933410dff6666e21930a85ac3843ad33b234e93fa5bd57b3f734756bd" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-unit" version="1.0.0"> @@ -368,12 +382,12 @@ <sha256 value="f3939264eec23987508fb20fd4874f3fe2fbf9f26e806e9ea434547e6eec36e6" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-unit" version="1.3.1"> - <artifact name="ui-unit-1.3.1.aar"> - <sha256 value="65dc73fe8177cbc7c7c884ad78471a7922c8c987ed372176d3749d3b4671bd30" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-unit" version="1.3.2"> + <artifact name="ui-unit-1.3.2.aar"> + <sha256 value="91069064158fee43a5838c0cd51f7b19bba4f6d1862dc8b764000f8421edccf5" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-unit-1.3.1.module"> - <sha256 value="84eb2ce1a930ec3ffcc30fd6bf5a4295b11a49307f781dd3ebf13138d33b670b" origin="Generated by Gradle"/> + <artifact name="ui-unit-1.3.2.module"> + <sha256 value="eecb5446872b5cd3caa1acce0e704780d1a3fa9feb2f06c6728ef9fb231b4cb5" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-util" version="1.0.0"> @@ -381,12 +395,12 @@ <sha256 value="a09871728e5a9d050d2fdcb99a875ef2120dc6deea808f5a6d443dd887e081ca" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-util" version="1.3.1"> - <artifact name="ui-util-1.3.1.aar"> - <sha256 value="378ddc37166b62091d9f33ad00b20d2fab65d3637dc045d7cbfd9d1ab1f9f30e" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-util" version="1.3.2"> + <artifact name="ui-util-1.3.2.aar"> + <sha256 value="b2f15225c1f59482445b1bc59a6dcb067cee62edaa611140aeaf27587bf41077" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-util-1.3.1.module"> - <sha256 value="d8e036a2aeb9e2cae99871c381bd79de80a4583e2bdaa416ec3f23b8725156b8" origin="Generated by Gradle"/> + <artifact name="ui-util-1.3.2.module"> + <sha256 value="1aaf9e8d25921280c2009a4e4032b08656c97bdebfdc7d15afabb50d2bda0fd3" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.concurrent" name="concurrent-futures" version="1.0.0"> @@ -1000,14 +1014,6 @@ <sha256 value="64fd82365fbac35a456a2bdd5fdcd41772b3f09e904ff4a43d1f40e61641d950" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.android.tools.build" name="aapt2-proto" version="7.0.0-beta04-7396180"> - <artifact name="aapt2-proto-7.0.0-beta04-7396180.jar"> - <sha256 value="1ca4f1b0f550c6c25f63c1916da84f6e7a92c66b7ad38ab1d5d49a20552a5984" origin="Generated by Gradle"/> - </artifact> - <artifact name="aapt2-proto-7.0.0-beta04-7396180.module"> - <sha256 value="22b5d69296c06b99261c2b5485994af1e6e7e02beb6a8d213ce88dae76660755" origin="Generated by Gradle"/> - </artifact> - </component> <component group="com.android.tools.build" name="aapt2-proto" version="7.3.1-8691043"> <artifact name="aapt2-proto-7.3.1-8691043.jar"> <sha256 value="d5e2f3e1e1eb06224b6875f5e513c72a65182342745718160caf191d46a96664" origin="Generated by Gradle"/> @@ -1118,46 +1124,11 @@ <sha256 value="a0f464cbd7f528aa15846611626c7afcd08649804ca72782c6e3f291a065a0c1" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.android.tools.external.com-intellij" name="intellij-core" version="30.3.1"> - <artifact name="intellij-core-30.3.1.jar"> - <sha256 value="8bb2aecfb8dd2208fe341a731ac44a9ec83f989c12449b82dff1eab493de0408" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="30.3.1"> - <artifact name="kotlin-compiler-30.3.1.jar"> - <sha256 value="ccdc9e1abfafdec71f4f93a3a2ad6230a1384925b06fc277d4ed921de5bb6fd8" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="com.android.tools.external.org-jetbrains" name="uast" version="30.3.1"> - <artifact name="uast-30.3.1.jar"> - <sha256 value="47bf3fc2a6a9aa09f728788e869033341abd9d8cdb9fc61087dfb7cd576076d8" origin="Generated by Gradle"/> - </artifact> - </component> <component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.3.1"> <artifact name="layoutlib-api-30.3.1.jar"> <sha256 value="7ffb2c13ac92e2d2d454c617ec537ad3b8868a987118c4d3c62018125d656707" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.android.tools.lint" name="lint" version="30.3.1"> - <artifact name="lint-30.3.1.jar"> - <sha256 value="685080782f6368cc68ac74db065b4c5c59d9c82599dc34be2ec39e425251b864" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="com.android.tools.lint" name="lint-api" version="30.3.1"> - <artifact name="lint-api-30.3.1.jar"> - <sha256 value="cc6ebd7a146226363aa38bbb4a10d3e329079ac3201dbfeb562605be691d482c" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="com.android.tools.lint" name="lint-checks" version="30.3.1"> - <artifact name="lint-checks-30.3.1.jar"> - <sha256 value="a6a728be66b4e1cb61333f77f519f8213450989be0fbe125ff77e6241d07be8e" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="com.android.tools.lint" name="lint-gradle" version="30.3.1"> - <artifact name="lint-gradle-30.3.1.jar"> - <sha256 value="331c4ac1769c26bf90657db219dcc639ca63fe2fbae9db1ff674dd0a62c74676" origin="Generated by Gradle"/> - </artifact> - </component> <component group="com.android.tools.lint" name="lint-model" version="30.3.1"> <artifact name="lint-model-30.3.1.jar"> <sha256 value="4b6fc00a29c8dc716fb3a53b200af711318d2a8db5fa6c3d874b6d6d65e44541" origin="Generated by Gradle"/> @@ -1872,11 +1843,6 @@ <sha256 value="7d938c81789028045c08c065e94be75fc280527620d5bd62b519d5838532368a" origin="Generated by Gradle"/> </artifact> </component> - <component group="commons-codec" name="commons-codec" version="1.10"> - <artifact name="commons-codec-1.10.jar"> - <sha256 value="4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569" origin="Generated by Gradle"/> - </artifact> - </component> <component group="commons-codec" name="commons-codec" version="1.11"> <artifact name="commons-codec-1.11.jar"> <sha256 value="e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d" origin="Generated by Gradle"/> @@ -2285,11 +2251,6 @@ <sha256 value="1df8b9430b5c8ed143d7815e403e33ef5371b2400aadbe9bda0883762e0846d1" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.apache.commons" name="commons-compress" version="1.20"> - <artifact name="commons-compress-1.20.jar"> - <sha256 value="0aeb625c948c697ea7b205156e112363b59ed5e2551212cd4e460bdb72c7c06e" origin="Generated by Gradle"/> - </artifact> - </component> <component group="org.apache.commons" name="commons-compress" version="1.22"> <artifact name="commons-compress-1.22.jar"> <sha256 value="53d04a0efc7223baecaa303bd5d298eb0600e6b82b4076f9cecd558b97ba760b" origin="Generated by Gradle"/> @@ -2325,16 +2286,6 @@ <sha256 value="6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.apache.httpcomponents" name="httpclient" version="4.5.6"> - <artifact name="httpclient-4.5.6.jar"> - <sha256 value="c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7" origin="Generated by Gradle"/> - </artifact> - </component> - <component group="org.apache.httpcomponents" name="httpcore" version="4.4.13"> - <artifact name="httpcore-4.4.13.jar"> - <sha256 value="e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424" origin="Generated by Gradle"/> - </artifact> - </component> <component group="org.apache.httpcomponents" name="httpcore" version="4.4.14"> <artifact name="httpcore-4.4.14.jar"> <sha256 value="f956209e450cb1d0c51776dfbd23e53e9dd8db9a1298ed62b70bf0944ba63b28" origin="Generated by Gradle"/> @@ -2428,11 +2379,6 @@ <sha256 value="729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.codehaus.groovy" name="groovy" version="3.0.9"> - <artifact name="groovy-3.0.9.jar"> - <sha256 value="77bf86897f295f8cae2e1f46b1eca109f487ba81b66ef24a2b6dcba1eb7d6ce7" origin="Generated by Gradle"/> - </artifact> - </component> <component group="org.codehaus.mojo" name="animal-sniffer-annotations" version="1.19"> <artifact name="animal-sniffer-annotations-1.19.jar"> <sha256 value="e67ec27ceeaf13ab5d54cf5fdbcc544c41b4db8d02d9f006678cca2c7c13ee9d" origin="Generated by Gradle"/> @@ -2531,11 +2477,6 @@ <sha256 value="ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.jetbrains.intellij.deps" name="trove4j" version="1.0.20181211"> - <artifact name="trove4j-1.0.20181211.jar"> - <sha256 value="affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601" origin="Generated by Gradle"/> - </artifact> - </component> <component group="org.jetbrains.intellij.deps" name="trove4j" version="1.0.20200330"> <artifact name="trove4j-1.0.20200330.jar"> <sha256 value="c5fd725bffab51846bf3c77db1383c60aaaebfe1b7fe2f00d23fe1b7df0a439d" origin="Generated by Gradle"/> @@ -2738,11 +2679,6 @@ <sha256 value="67a2665d697e9e9416a29a4b6083e355a287920f337694995fbe880a664c2bff" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.5.31"> - <artifact name="kotlin-reflect-1.5.31.jar"> - <sha256 value="6e0f5490e6b9649ddd2670534e4d3a03bd283c3358b8eef5d1304fd5f8a5a4fb" origin="Generated by Gradle"/> - </artifact> - </component> <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.7.10"> <artifact name="kotlin-reflect-1.7.10.jar"> <sha256 value="187c5e5a588a6ed18c3a41b54df138a5944121bdb396be1c3fa4abee67397955" origin="Generated by Gradle"/> diff --git a/android/scripts/update-lockfile.sh b/android/scripts/update-lockfile.sh new file mode 100755 index 0000000000..c30e3ca77c --- /dev/null +++ b/android/scripts/update-lockfile.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +set -eu + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd "$SCRIPT_DIR" + +echo "### Updating dependency lockfile ###" +echo "" + +echo "Removing old components..." +sed -i '/<components>/,/<\/components>/d' ../gradle/verification-metadata.xml + +echo "Generating new components..." +android_container_image_name=$(cat "../../building/android-container-image.txt") +podman run --rm -it \ + -v ../..:/build:Z \ + "$android_container_image_name" \ + android/gradlew -q -p android -M sha256 assembleAndroidTest |