diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 54471d38c0ec..afbb849858f2 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -30,11 +30,10 @@ compose-destinations = "2.1.0-beta13" compose-constraintlayout = "1.0.1" compose-material3 = "1.3.0" -# Await resolution of https://github.com/grpc/grpc-java/issues/11550 before updating. -grpc = "1.67.1" +grpc = "1.68.1" grpc-kotlin = "1.4.1" grpc-kotlin-jar = "1.4.1:jdk8@jar" -grpc-protobuf = "4.28.2" +grpc-protobuf = "4.28.3" # Koin koin = "4.0.0" diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index d37205c4c16d..f279134a5abf 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -3364,43 +3364,43 @@ - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -4193,9 +4193,9 @@ - - - + + + @@ -4203,9 +4203,9 @@ - - - + + + @@ -4213,9 +4213,9 @@ - - - + + + @@ -4223,9 +4223,9 @@ - - - + + + @@ -4241,9 +4241,9 @@ - - - + + + @@ -4256,9 +4256,9 @@ - - - + + + @@ -4271,38 +4271,38 @@ - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt index 37a3c9cdc07f..d77a9ba6c791 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt @@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.lib.daemon.grpc.resolver import io.grpc.EquivalentAddressGroup import io.grpc.NameResolver +import io.grpc.StatusOr import java.net.InetSocketAddress class DummyNameResolver : NameResolver() { @@ -11,10 +12,12 @@ class DummyNameResolver : NameResolver() { override fun start(listener: Listener2) { val resolutionResult = ResolutionResult.newBuilder() - .setAddresses( - listOf( - EquivalentAddressGroup( - InetSocketAddress.createUnresolved(DUMMY_HOST, DUMMY_PORT) + .setAddressesOrError( + StatusOr.fromValue( + listOf( + EquivalentAddressGroup( + InetSocketAddress.createUnresolved(DUMMY_HOST, DUMMY_PORT) + ) ) ) )