From e3d85dac96fc6647fec59a6ccdca75803d4e97ec Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:28:10 +0100 Subject: [PATCH 01/20] Bump dependency check plugin --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 8076f2496aa6..48bdbdb9a092 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -49,7 +49,7 @@ object Versions { const val android = "8.2.1" const val androidAapt = "$android-10154469" const val playPublisher = "3.8.4" - const val dependencyCheck = "8.3.1" + const val dependencyCheck = "9.0.9" const val detekt = "1.23.4" const val gradleVersions = "0.47.0" const val junit5 = "1.10.0.0" From dd61b8ca12586bc328dbf9c115f01b4388ea8d70 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:30:45 +0100 Subject: [PATCH 02/20] Bump dependency version plugin --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 48bdbdb9a092..9d120cec1ff1 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -51,7 +51,7 @@ object Versions { const val playPublisher = "3.8.4" const val dependencyCheck = "9.0.9" const val detekt = "1.23.4" - const val gradleVersions = "0.47.0" + const val gradleVersions = "0.51.0" const val junit5 = "1.10.0.0" const val ktfmt = "0.16.0" // Ksp version is linked with kotlin version, find matching release here: From 79438af3a50d76c7aaca2d3b830f3ab1f12c2358 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:33:03 +0100 Subject: [PATCH 03/20] Bump compose --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 9d120cec1ff1..017dbfba1ffe 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -36,7 +36,7 @@ object Versions { object Compose { const val destinations = "1.10.1" - const val base = "1.6.2" + const val base = "1.6.3" const val constrainLayout = "1.0.1" const val foundation = base const val material3 = "1.2.0" From aa0af67fc6fbbe38277365c9aa2bc18be5246fa6 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:36:03 +0100 Subject: [PATCH 04/20] Bump material3 --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 017dbfba1ffe..8f7d48d44138 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -39,7 +39,7 @@ object Versions { const val base = "1.6.3" const val constrainLayout = "1.0.1" const val foundation = base - const val material3 = "1.2.0" + const val material3 = "1.2.1" } object Plugin { From 8fa6f5440204c9377ac7e98c05077115f609fdd2 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:37:39 +0100 Subject: [PATCH 05/20] Bump leakcanary --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 8f7d48d44138..b9f5b9c1aa51 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -7,7 +7,7 @@ object Versions { const val kotlin = "1.9.22" const val kotlinCompilerExtensionVersion = "1.5.10" const val kotlinx = "1.7.3" - const val leakCanary = "2.12" + const val leakCanary = "2.13" const val mockk = "1.13.8" const val mockWebserver = "4.12.0" const val turbine = "1.0.0" From 1b20fb1b7564d5125de4c26530745d5e29a216a0 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:38:23 +0100 Subject: [PATCH 06/20] Bump play publisher plugin --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index b9f5b9c1aa51..640a995cc671 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -48,7 +48,7 @@ object Versions { // https://github.com/gradle/gradle/issues/19228 const val android = "8.2.1" const val androidAapt = "$android-10154469" - const val playPublisher = "3.8.4" + const val playPublisher = "3.9.0" const val dependencyCheck = "9.0.9" const val detekt = "1.23.4" const val gradleVersions = "0.51.0" From 0840baecb78db53ba5395471c3a7da7f52b73947 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:39:33 +0100 Subject: [PATCH 07/20] Bump ktfmt --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 640a995cc671..f54f1a92e4a1 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -53,7 +53,7 @@ object Versions { const val detekt = "1.23.4" const val gradleVersions = "0.51.0" const val junit5 = "1.10.0.0" - const val ktfmt = "0.16.0" + const val ktfmt = "0.17.0" // Ksp version is linked with kotlin version, find matching release here: // https://github.com/google/ksp/releases const val ksp = "${kotlin}-1.0.17" From e324cc6e3211f7b7ad0e23595d561b1265eadb1e Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:40:11 +0100 Subject: [PATCH 08/20] Bump detekt --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index f54f1a92e4a1..aed9b68c6a7e 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -50,7 +50,7 @@ object Versions { const val androidAapt = "$android-10154469" const val playPublisher = "3.9.0" const val dependencyCheck = "9.0.9" - const val detekt = "1.23.4" + const val detekt = "1.23.5" const val gradleVersions = "0.51.0" const val junit5 = "1.10.0.0" const val ktfmt = "0.17.0" From 0149dd6af836769f5c526d52769e169288dd156b Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:41:01 +0100 Subject: [PATCH 09/20] Bump junit --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index aed9b68c6a7e..84f0eb4c223c 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val commonsValidator = "1.8.0" const val jodaTime = "2.12.5" - const val junit = "5.10.0" + const val junit = "5.10.2" const val jvmTarget = "17" const val konsist = "0.13.0" const val kotlin = "1.9.22" From aa6ccaf57af2902e1afad4a9534ae5d93cfaf890 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:42:20 +0100 Subject: [PATCH 10/20] Bump joda --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 84f0eb4c223c..5918693c0399 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,6 @@ object Versions { const val commonsValidator = "1.8.0" - const val jodaTime = "2.12.5" + const val jodaTime = "2.12.7" const val junit = "5.10.2" const val jvmTarget = "17" const val konsist = "0.13.0" From 1bf48d2d11ec5b298a7791dea33210ce248fecc1 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:43:07 +0100 Subject: [PATCH 11/20] Bump fragment --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 5918693c0399..2fca96453baa 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -26,7 +26,7 @@ object Versions { const val coreKtx = "1.12.0" const val espresso = "3.5.1" const val lifecycle = "2.7.0" - const val fragment = "1.6.1" + const val fragment = "1.6.2" const val test = "1.5.0" const val testMonitor = "1.6.1" const val testOrchestrator = "1.4.2" From ab74c7eb64cfeaca92bfe0aa26b401562cef9c7a Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:44:30 +0100 Subject: [PATCH 12/20] Bump compose destinations --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 2fca96453baa..d8669d1cff62 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -35,7 +35,7 @@ object Versions { } object Compose { - const val destinations = "1.10.1" + const val destinations = "1.10.2" const val base = "1.6.3" const val constrainLayout = "1.0.1" const val foundation = base From 24e591aaea1650602d53732fc650bf6cbdb6f3bc Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:50:11 +0100 Subject: [PATCH 13/20] Bump billing client --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index d8669d1cff62..84a102330191 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -11,7 +11,7 @@ object Versions { const val mockk = "1.13.8" const val mockWebserver = "4.12.0" const val turbine = "1.0.0" - const val billingClient = "6.0.1" + const val billingClient = "6.2.0" object Android { const val compileSdkVersion = 34 From e762928aaa0177c3c0649312b3bab01b99e055cd Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:51:08 +0100 Subject: [PATCH 14/20] Bump kotlinx --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 84a102330191..b162acaa50b1 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -6,7 +6,7 @@ object Versions { const val konsist = "0.13.0" const val kotlin = "1.9.22" const val kotlinCompilerExtensionVersion = "1.5.10" - const val kotlinx = "1.7.3" + const val kotlinx = "1.8.0" const val leakCanary = "2.13" const val mockk = "1.13.8" const val mockWebserver = "4.12.0" From a7a5f2552b129bab1304ea8c46d39124ca76439e Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 15:52:59 +0100 Subject: [PATCH 15/20] Bump gradle --- android/app/build.gradle.kts | 8 ++++---- android/buildSrc/src/main/kotlin/Versions.kt | 4 ++-- android/gradle.properties | 1 - android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- android/test/e2e/build.gradle.kts | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 5a82ae72844e..c73b3d828f92 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -33,7 +33,7 @@ android { compileSdk = Versions.Android.compileSdkVersion defaultConfig { - val localProperties = gradleLocalProperties(rootProject.projectDir) + val localProperties = gradleLocalProperties(rootProject.projectDir, providers) applicationId = "net.mullvad.mullvadvpn" minSdk = Versions.Android.minSdkVersion @@ -114,7 +114,7 @@ android { sourceSets { getByName("main") { val changelogDir = - gradleLocalProperties(rootProject.projectDir) + gradleLocalProperties(rootProject.projectDir, providers) .getOrDefault("OVERRIDE_CHANGELOG_DIR", defaultChangelogAssetsDirectory) assets.srcDirs(extraAssetsDirectory, changelogDir) @@ -181,13 +181,13 @@ android { applicationVariants.configureEach { val alwaysShowChangelog = - gradleLocalProperties(rootProject.projectDir).getProperty("ALWAYS_SHOW_CHANGELOG") + gradleLocalProperties(rootProject.projectDir, providers).getProperty("ALWAYS_SHOW_CHANGELOG") ?: "false" buildConfigField("boolean", "ALWAYS_SHOW_CHANGELOG", alwaysShowChangelog) val enableInAppVersionNotifications = - gradleLocalProperties(rootProject.projectDir) + gradleLocalProperties(rootProject.projectDir, providers) .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") ?: "true" diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index b162acaa50b1..7bd937f6b0b7 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -46,8 +46,8 @@ object Versions { // The androidAapt plugin version must be in sync with the android plugin version. // Required for Gradle metadata verification to work properly, see: // https://github.com/gradle/gradle/issues/19228 - const val android = "8.2.1" - const val androidAapt = "$android-10154469" + const val android = "8.3.0" + const val androidAapt = "$android-10880808" const val playPublisher = "3.9.0" const val dependencyCheck = "9.0.9" const val detekt = "1.23.5" diff --git a/android/gradle.properties b/android/gradle.properties index 912e0912ff83..74c277e3a155 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -3,4 +3,3 @@ android.nonTransitiveRClass=false android.useAndroidX=true kotlin.code.style=official org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M" -android.experimental.lint.version=8.3.0-beta02 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e6919610b914..94abb13345c0 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip # Retrieved from: https://gradle.org/release-checksums/ -distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1 +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts index 7d9a78cda6ea..161e73b510f9 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -33,7 +33,7 @@ android { fun MutableMap.addOptionalPropertyAsArgument(name: String) { val value = rootProject.properties.getOrDefault(name, null) as? String - ?: gradleLocalProperties(rootProject.projectDir).getProperty(name) + ?: gradleLocalProperties(rootProject.projectDir, providers).getProperty(name) if (value != null) { put(name, value) From 792f4a40e5c53561f30a0eed0399ee86d988e597 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 16:30:49 +0100 Subject: [PATCH 16/20] Bump mockk --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 7bd937f6b0b7..25394d9fa70a 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -8,7 +8,7 @@ object Versions { const val kotlinCompilerExtensionVersion = "1.5.10" const val kotlinx = "1.8.0" const val leakCanary = "2.13" - const val mockk = "1.13.8" + const val mockk = "1.13.10" const val mockWebserver = "4.12.0" const val turbine = "1.0.0" const val billingClient = "6.2.0" From 200939017492d65b2bc1dfbdbb2f0953cde1dcdb Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 16:34:30 +0100 Subject: [PATCH 17/20] Remove forced emoji2 dependency resolution --- android/app/build.gradle.kts | 7 ------- android/lib/theme/build.gradle.kts | 7 ------- 2 files changed, 14 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index c73b3d828f92..750b98aa6740 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -304,13 +304,6 @@ afterEvaluate { play { serviceAccountCredentials.set(file("play-api-key.json")) } -configurations.all { - resolutionStrategy { - // Hold back emoji2 since newer versions require api level 34 which is not yet stable. - force("androidx.emoji2:emoji2:1.3.0") - } -} - dependencies { implementation(project(Dependencies.Mullvad.vpnService)) implementation(project(Dependencies.Mullvad.tileService)) diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts index 687184c5c0ac..dbf80a3b9820 100644 --- a/android/lib/theme/build.gradle.kts +++ b/android/lib/theme/build.gradle.kts @@ -27,13 +27,6 @@ android { } } -configurations.all { - resolutionStrategy { - // Hold back emoji2 since newer versions require api level 34 which is not yet stable. - force("androidx.emoji2:emoji2:1.3.0") - } -} - dependencies { implementation(Dependencies.Compose.material3) implementation(Dependencies.Compose.ui) From 836ed422e8bfa441c9ec046ce9a1d640719342b0 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 16:37:11 +0100 Subject: [PATCH 18/20] Bump konsist --- android/buildSrc/src/main/kotlin/Versions.kt | 2 +- .../net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt | 2 +- .../net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 25394d9fa70a..606ed2e57547 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -3,7 +3,7 @@ object Versions { const val jodaTime = "2.12.7" const val junit = "5.10.2" const val jvmTarget = "17" - const val konsist = "0.13.0" + const val konsist = "0.14.0" const val kotlin = "1.9.22" const val kotlinCompilerExtensionVersion = "1.5.10" const val kotlinx = "1.8.0" diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt index e1162e11d369..1732fb48d657 100644 --- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt +++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt @@ -12,6 +12,6 @@ class DataClassTest { Konsist.scopeFromProject() .classes(includeNested = true) .withDataModifier() - .properties(includeNested = false, includeLocal = false) + .properties(includeNested = false) .assertFalse { it.hasVarModifier } } diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt index 2b45d4481618..737a639b60f7 100644 --- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt +++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt @@ -9,7 +9,7 @@ class ValueClassTest { @Test fun `ensure value classes property is named value`() { Konsist.scopeFromProject().classes(includeNested = true).withValueModifier().assertTrue { - it.properties(includeNested = false, includeLocal = false).firstOrNull { property -> + it.properties(includeNested = false).firstOrNull { property -> property.name == "value" } != null } From 9e2a90adc7b551b9fa18380a3fb2d1749e96dc41 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 20:25:41 +0100 Subject: [PATCH 19/20] Update gradle lockfile --- android/gradle/verification-metadata.xml | 2671 +++++++++++----------- 1 file changed, 1333 insertions(+), 1338 deletions(-) diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index d214b64f7f62..13a615352c3b 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -15,7 +15,7 @@ - Comments after the verification-metadata opening tag will automatically be removed by gradle when generating components. --> - + true false @@ -32,6 +32,14 @@ + + + + + + + + @@ -281,11 +289,11 @@ - - - + + + - + @@ -297,12 +305,12 @@ - - - + + + - + @@ -318,11 +326,11 @@ - - - + + + - + @@ -334,12 +342,12 @@ - - - + + + - + @@ -347,20 +355,20 @@ - - + + - - + + - - + + - - + + @@ -379,11 +387,11 @@ - - - + + + - + @@ -395,20 +403,20 @@ - - - + + + - + - - - + + + - - + + @@ -424,11 +432,11 @@ - - - + + + - + @@ -440,20 +448,20 @@ - - - + + + - + - - + + - - + + @@ -540,28 +548,28 @@ - - - + + + - + - - - + + + - + - - - + + + - - + + @@ -579,76 +587,76 @@ - - - + + + - + - - - + + + - + - - - + + + - - + + - - - + + + - + - - - + + + - + - - + + - - + + - - - + + + - + - - - + + + - + - - + + - - + + @@ -656,28 +664,28 @@ - - - + + + - + - - - + + + - + - - + + - - + + @@ -685,62 +693,62 @@ - - - + + + - + - - - + + + - + - - + + - - + + - - - + + + - - - + + + - + - - - + + + - - - + + + - + - - - + + + - - + + @@ -753,100 +761,100 @@ - - - + + + - + - - - + + + - + - - + + - - + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - - + + - - + + - - + + - - - + + + - + - - - + + + - + - - + + - - + + @@ -854,28 +862,28 @@ - - - + + + - + - - - + + + - + - - + + - - + + @@ -883,28 +891,28 @@ - - - + + + - + - - - + + + - + - - + + - - + + @@ -944,6 +952,11 @@ + + + + + @@ -1004,14 +1017,14 @@ - - + + - - - + + + @@ -1051,6 +1064,11 @@ + + + + + @@ -1059,14 +1077,6 @@ - - - - - - - - @@ -1075,14 +1085,6 @@ - - - - - - - - @@ -1091,14 +1093,6 @@ - - - - - - - - @@ -1107,14 +1101,6 @@ - - - - - - - - @@ -1232,6 +1218,9 @@ + + + @@ -1329,6 +1318,14 @@ + + + + + + + + @@ -1403,6 +1400,14 @@ + + + + + + + + @@ -1472,6 +1477,14 @@ + + + + + + + + @@ -1566,6 +1579,9 @@ + + + @@ -1716,6 +1732,11 @@ + + + + + @@ -1758,251 +1779,182 @@ - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - - - - - - - + + + - - - - - - - + + - - - - - - - + + - - - - - - - + + - - - - - - - + + - - - - - - - + + - - - - - - - - + + + - - + + - - - - - - - + + - - - - - - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - - - - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - - - - - - - - - - - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2026,214 +1978,199 @@ - - - - - - - + + - - - + + + - - + + - - + + - - + + - - - - - - - + + - - + + - - + + - - - + + + - - + + - - - - - - - + + - - - - - - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + + + + - - + + + + - - - + + + @@ -2257,65 +2194,73 @@ - - - + + + + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2328,36 +2273,36 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2385,34 +2330,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2425,11 +2395,6 @@ - - - - - @@ -2479,16 +2444,16 @@ - - - - - + + + + + @@ -2519,11 +2484,6 @@ - - - - - @@ -2534,6 +2494,14 @@ + + + + + + + + @@ -2544,24 +2512,19 @@ - - - + + + - - - + + + - - - - - - - - + + + @@ -2579,49 +2542,44 @@ - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2649,12 +2607,12 @@ - - - + + + - - + + @@ -2670,12 +2628,17 @@ - - - + + + + + + - - + + + + @@ -2701,124 +2664,124 @@ - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2910,11 +2873,6 @@ - - - - - @@ -2950,9 +2908,9 @@ - - - + + + @@ -3039,260 +2997,271 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + @@ -3359,155 +3328,155 @@ - - - + + + - + - - - + + + - + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3520,12 +3489,12 @@ - - - + + + - - + + @@ -3533,6 +3502,11 @@ + + + + + @@ -3568,9 +3542,9 @@ - - - + + + @@ -3628,34 +3602,34 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -3678,6 +3652,21 @@ + + + + + + + + + + + + + + + @@ -3741,14 +3730,6 @@ - - - - - - - - @@ -3757,14 +3738,22 @@ + + + + + + + + - - - + + + @@ -3792,12 +3781,12 @@ - - - + + + - - + + @@ -3851,9 +3840,9 @@ - - - + + + @@ -3866,17 +3855,22 @@ - - - + + + + + + - - - + + + - - + + + + @@ -3884,24 +3878,29 @@ + + + + + + + + + + - - - - - - - - + + + @@ -3909,9 +3908,9 @@ - - - + + + @@ -3919,9 +3918,9 @@ - - - + + + @@ -3929,9 +3928,9 @@ - - - + + + @@ -3939,19 +3938,14 @@ - - - - - - - - + + + @@ -3959,12 +3953,12 @@ - - - + + + - - + + @@ -3975,9 +3969,9 @@ - - - + + + @@ -3985,15 +3979,15 @@ - - - + + + - - + + - - + + @@ -4004,12 +3998,12 @@ - - - + + + - - + + @@ -4020,9 +4014,9 @@ - - - + + + @@ -4030,12 +4024,12 @@ - - - + + + - - + + @@ -4046,9 +4040,9 @@ - - - + + + @@ -4056,9 +4050,9 @@ - - - + + + @@ -4066,9 +4060,9 @@ - - - + + + @@ -4076,9 +4070,9 @@ - - - + + + @@ -4096,9 +4090,9 @@ - - - + + + @@ -4111,11 +4105,6 @@ - - - - - @@ -4126,27 +4115,22 @@ - - - - - - - - + + + - - + + - - - + + + @@ -4154,14 +4138,9 @@ - - - - - - - - + + + @@ -4169,9 +4148,14 @@ - - - + + + + + + + + @@ -4179,9 +4163,9 @@ - - - + + + @@ -4189,9 +4173,9 @@ - - - + + + @@ -4199,9 +4183,9 @@ - - - + + + @@ -4224,12 +4208,10 @@ - - - - - + + + @@ -4238,9 +4220,6 @@ - - - @@ -4256,6 +4235,14 @@ + + + + + + + + @@ -4271,9 +4258,9 @@ - - - + + + @@ -4286,6 +4273,16 @@ + + + + + + + + + + @@ -4331,6 +4328,16 @@ + + + + + + + + + + @@ -4371,6 +4378,11 @@ + + + + + @@ -4423,9 +4435,9 @@ - - - + + + @@ -4433,9 +4445,9 @@ - - - + + + @@ -4443,9 +4455,9 @@ - - - + + + @@ -4469,12 +4481,12 @@ - - - + + + - - + + @@ -4509,12 +4521,12 @@ - - - + + + - - + + @@ -4530,9 +4542,9 @@ - - - + + + @@ -4543,12 +4555,12 @@ - - - + + + - - + + @@ -4567,12 +4579,12 @@ - - - + + + - - + + @@ -4583,12 +4595,12 @@ - - - + + + - - + + @@ -4596,12 +4608,12 @@ - - - + + + - - + + @@ -4609,20 +4621,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -4672,9 +4684,9 @@ - - - + + + @@ -4687,9 +4699,9 @@ - - - + + + @@ -4697,26 +4709,11 @@ - - - - - - - - - - - - - - - @@ -4732,12 +4729,12 @@ - - - + + + - - + + @@ -4745,20 +4742,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -4766,12 +4763,12 @@ - - - + + + - - + + @@ -4782,51 +4779,79 @@ - - - + + + - - + + - - - + + + + + + + + - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + @@ -4845,34 +4870,19 @@ - - - - - - - - - - - - - - - - - - + + + @@ -4880,32 +4890,32 @@ - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + @@ -4953,29 +4963,14 @@ - - - - - - - - - - - - - - - - - - + + + - - - + + + From 59406358498888dff3aec5cd3ab4333ec74b1ffa Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 11 Mar 2024 20:54:18 +0100 Subject: [PATCH 20/20] Suppress false-positive CVE-2014-9152 --- android/config/dependency-check-suppression.xml | 8 ++++++++ android/test/test-suppression.xml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/android/config/dependency-check-suppression.xml b/android/config/dependency-check-suppression.xml index c7ec54a5e86d..b8712349edc7 100644 --- a/android/config/dependency-check-suppression.xml +++ b/android/config/dependency-check-suppression.xml @@ -60,4 +60,12 @@ ^pkg:maven/com\.google\.devtools\.ksp/symbol\-processing.*@.*$ CVE-2018-1000840 + + + ^pkg:maven/androidx\.test\.services/storage@.*$ + CVE-2014-9152 + diff --git a/android/test/test-suppression.xml b/android/test/test-suppression.xml index f92e67c0dbce..5932bda92e90 100644 --- a/android/test/test-suppression.xml +++ b/android/test/test-suppression.xml @@ -110,4 +110,12 @@ ^pkg:maven/com\.squareup\.okhttp3/.*@.*$ CVE-2023-3782 + + + ^pkg:maven/androidx\.test\.services/storage@.*$ + CVE-2014-9152 +