diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b68a4bd61b..6b57b1042d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -537,8 +537,12 @@ dependencies { implementation(libs.molly.glide.webp.decoder) implementation(libs.gosimple.nbvcxz) "fossImplementation"("org.osmdroid:osmdroid-android:6.1.16") - implementation(libs.unifiedpush.connector) - implementation(libs.unifiedpush.connector.ui) + implementation(libs.unifiedpush.connector) { + exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib") + } + implementation(libs.unifiedpush.connector.ui) { + exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib") + } "gmsImplementation"(project(":billing")) diff --git a/app/proguard/proguard.cfg b/app/proguard/proguard.cfg index 328a112b55..13fe0e7e33 100644 --- a/app/proguard/proguard.cfg +++ b/app/proguard/proguard.cfg @@ -25,4 +25,4 @@ -dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl -dontwarn org.slf4j.impl.StaticLoggerBinder -dontwarn sun.net.spi.nameservice.NameService --dontwarn sun.net.spi.nameservice.NameServiceDescriptor +-dontwarn sun.net.spi.nameservice.NameServiceDescriptor \ No newline at end of file diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f14bdbf490..7d2fb386b5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -5180,22 +5180,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - - - - - - - - - @@ -5203,9 +5187,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - @@ -8427,14 +8408,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - - - - @@ -8510,11 +8483,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - - diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java index b8c49a7b34..7789205fa4 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java @@ -1052,4 +1052,5 @@ public RegistrationApi getRegistrationApi() { public AuthCredentials getPaymentsAuthorization() throws IOException { return pushServiceSocket.getPaymentsAuthorization(); } + } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java index c0f503507b..d93397d8cc 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java @@ -70,7 +70,6 @@ import org.whispersystems.signalservice.api.messages.calls.CallingResponse; import org.whispersystems.signalservice.api.messages.calls.TurnServerInfo; import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo; -import org.whispersystems.signalservice.api.messages.multidevice.VerifyDeviceResponse; import org.whispersystems.signalservice.api.payments.CurrencyConversions; import org.whispersystems.signalservice.api.profiles.ProfileAndCredential; import org.whispersystems.signalservice.api.profiles.SignalServiceProfile; diff --git a/settings.gradle.kts b/settings.gradle.kts index e3dcaf576e..9b9648ba03 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,12 +17,6 @@ dependencyResolutionManagement { includeGroup("org.signal") } } - maven { - url = uri("https://jitpack.io") - content { - includeModule("com.github.UnifiedPush", "android-connector") - } - } maven { url = uri("https://raw.githubusercontent.com/mollyim/maven/master/argon2/releases/") content {