From e07a715ab78c0b35de3ed74c0ca72f83c745d34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 08:31:17 +0100 Subject: [PATCH 1/9] Bump kotlin to 2.1.0 --- android/gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 90313496905a..ea4e3dab9985 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -45,8 +45,8 @@ ktor = "3.0.1" # Kotlin # Bump kotlin and kotlin-ksp together, find matching release here: # https://github.com/google/ksp/releases -kotlin = "2.0.21" -kotlin-ksp = "2.0.21-1.0.26" +kotlin = "2.1.0" +kotlin-ksp = "2.1.0-1.0.29" kotlinx = "1.9.0" kotlinx-serialization = "2.0.21" From 72fcc54ad12c0d76f9c91347d701cf42efd55b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 08:36:09 +0100 Subject: [PATCH 2/9] Bump serialization to 2.1.0 --- android/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index ea4e3dab9985..6e68e6825e6b 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -48,7 +48,7 @@ ktor = "3.0.1" kotlin = "2.1.0" kotlin-ksp = "2.1.0-1.0.29" kotlinx = "1.9.0" -kotlinx-serialization = "2.0.21" +kotlinx-serialization = "2.1.0" # Protobuf protobuf = "0.9.4" From c3a82da365bb3cb920c9ad420ea6a52c2a7f7bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 08:32:31 +0100 Subject: [PATCH 3/9] Bump kermit to 2.0.5 --- android/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 6e68e6825e6b..d98456c80dd5 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -59,7 +59,7 @@ dependency-check = "10.0.4" dependency-versions = "0.51.0" detekt = "1.23.7" jodatime = "2.13.0" -kermit = "2.0.4" +kermit = "2.0.5" konsist = "0.16.1" ktfmt = "0.21.0" leakcanary = "2.14" From bfb02de0d7b6f74b2e4d2f70534966eda7ee2fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 08:32:56 +0100 Subject: [PATCH 4/9] Bump grpc to 1.68.2 --- android/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index d98456c80dd5..58f98ebb6703 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -30,7 +30,7 @@ compose-destinations = "2.1.0-beta14" compose-constraintlayout = "1.1.0" compose-material3 = "1.3.1" -grpc = "1.68.1" +grpc = "1.68.2" grpc-kotlin = "1.4.1" grpc-kotlin-jar = "1.4.1:jdk8@jar" grpc-protobuf = "4.28.3" From fc52e64f4804564ea45653f1d77159aea31cdb91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 08:33:26 +0100 Subject: [PATCH 5/9] Bump grpc-protobuf to 4.29.0 --- android/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 58f98ebb6703..ce2477288a77 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -33,7 +33,7 @@ compose-material3 = "1.3.1" grpc = "1.68.2" grpc-kotlin = "1.4.1" grpc-kotlin-jar = "1.4.1:jdk8@jar" -grpc-protobuf = "4.28.3" +grpc-protobuf = "4.29.0" # Koin koin = "4.0.0" From 68cd5749431d0948c0836e4b91d99e1f4d938056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 08:34:24 +0100 Subject: [PATCH 6/9] Bump triplet play to 3.12.1 --- android/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index ce2477288a77..dc9f88b8fdf3 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -68,7 +68,7 @@ leakcanary = "2.14" # https://github.com/mockk/mockk/issues/1308 mockk = "1.13.12" mockwebserver = "4.12.0" -play-publisher = "3.11.0" +play-publisher = "3.12.1" turbine = "1.2.0" [libraries] From 2d010b3eaeede5c79454e6db2363cc88842085a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 08:35:01 +0100 Subject: [PATCH 7/9] Bump konsist to 0.17.0 --- android/gradle/libs.versions.toml | 2 +- .../net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index dc9f88b8fdf3..86831034ec08 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -60,7 +60,7 @@ dependency-versions = "0.51.0" detekt = "1.23.7" jodatime = "2.13.0" kermit = "2.0.5" -konsist = "0.16.1" +konsist = "0.17.0" ktfmt = "0.21.0" leakcanary = "2.14" 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 1732fb48d657..c20277b1d985 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) - .assertFalse { it.hasVarModifier } + .properties(includeNested = true) + .assertFalse { it.isVar } } From 620e09154de03d104d072f071100cf630d9781e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 08:42:48 +0100 Subject: [PATCH 8/9] Bump gradle to 8.11.2 --- android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 24ff5e6e2d4e..2806e9b58137 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,8 +3,8 @@ distributionPath=wrapper/dists # Upgrade using gradle and wrapper using: ./gradlew wrapper --gradle-version # Compare wrapper checksum with: # https://services.gradle.org/distributions/gradle-{gradleVersion}-bin.zip.sha256 -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 87cd7aff82ac5189c1c2afac432470adef2ddfe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Thu, 28 Nov 2024 09:25:31 +0100 Subject: [PATCH 9/9] Update lockfile --- android/gradle/verification-metadata.xml | 871 +++++++++++------------ 1 file changed, 426 insertions(+), 445 deletions(-) diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index c1ed3d59b675..b36c9be82f1e 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -2440,68 +2440,68 @@ - - - + + + - - + + - - - + + + - + - - - + + + - + - - - + + + - - + + - - - + + + - + - - - + + + - + - - - + + + - - + + - - - + + + - - + + @@ -3051,36 +3051,36 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -3178,6 +3178,11 @@ + + + + + @@ -3188,9 +3193,9 @@ - - - + + + @@ -3209,33 +3214,33 @@ - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + @@ -3395,43 +3400,43 @@ - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -3489,12 +3494,12 @@ - - - + + + - - + + @@ -4224,8 +4229,8 @@ - - + + @@ -4234,9 +4239,9 @@ - - - + + + @@ -4244,9 +4249,9 @@ - - - + + + @@ -4254,9 +4259,9 @@ - - - + + + @@ -4272,9 +4277,9 @@ - - - + + + @@ -4287,9 +4292,9 @@ - - - + + + @@ -4302,38 +4307,38 @@ - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -5156,12 +5161,12 @@ - - - + + + - - + + @@ -5322,70 +5327,70 @@ - - - + + + - - + + - - - + + + - - - + + + - - - - + + - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -5393,11 +5398,6 @@ - - - - - @@ -5413,29 +5413,34 @@ - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -5443,11 +5448,6 @@ - - - - - @@ -5463,163 +5463,163 @@ - - - + + + - - + + + + + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + @@ -5642,11 +5642,6 @@ - - - - - @@ -5657,22 +5652,27 @@ - - - + + + + + + + + - - - + + + - - + + - - - + + + @@ -5680,11 +5680,6 @@ - - - - - @@ -5700,57 +5695,62 @@ - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + @@ -5781,17 +5781,6 @@ - - - - - - - - - - - @@ -5816,15 +5805,15 @@ - - - + + + - - + + - - + + @@ -5852,11 +5841,6 @@ - - - - - @@ -5867,9 +5851,9 @@ - - - + + + @@ -5912,9 +5896,9 @@ - - - + + + @@ -5952,9 +5936,9 @@ - - - + + + @@ -5965,61 +5949,66 @@ - - - + + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + @@ -6157,14 +6146,6 @@ - - - - - - - -