Exclude kotlin-stdlib from UP dependencies

mollyim · Sep 23, 2024 · 8b3122a · 8b3122a
1 parent bd23a21
commit 8b3122a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 42 deletions.
diff --git 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
@@ -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
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -5180,32 +5180,13 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b7bc6c98f2d2e1739d9e43a0959addce98e8b2ec48bd34926891854c9df24897" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.UnifiedPush" name="android-connector" version="2.1.1">
-         <artifact name="android-connector-2.1.1.aar">
-            <sha256 value="21983ecb673f826d622cb3aba168e3b84eaa522a8f056985aa00946d0692d6f7" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="android-connector-2.1.1.module">
-            <sha256 value="2758d4994b8339668a67857211981d93b903596fd06fd73e8b35abb31534f2ec" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.github.UnifiedPush" name="android-connector" version="2.4.0">
-         <artifact name="android-connector-2.4.0.aar">
-            <sha256 value="6ac50fd9acac605939bf818d0c2355ed783fbeef00ea351ed8e14cceb6ef2238" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="android-connector-2.4.0.module">
-            <sha256 value="68e92058a57388f4513a0f87da4a6cf10fd1075e1fae55f75e7a3deaf63b8fff" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.github.bumptech.glide" name="annotations" version="4.15.1">
          <artifact name="annotations-4.15.1.jar">
             <sha256 value="c331e74f28d573319d6863bfbef3691cd3775580ff4a33b95ed3f227cc339b0d" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="annotations-4.15.1.module">
             <sha256 value="162bc02c4673421ea0128927881c3fea7aa7a10d5738ac37d2bda91f48e8ebad" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="annotations-4.14.2.module">
-            <sha256 value="6ec1255219b1532ad3c3eb508227cbc5a1a946900ab7bf87d0961de83d105323" origin="Generated by Gradle"/>
-         </artifact>
       </component>
       <component group="com.github.bumptech.glide" name="disklrucache" version="4.15.1">
          <artifact name="disklrucache-4.15.1.jar">
@@ -8427,14 +8408,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f482314b5079c1455f6fb0d4257a745d101c6124ce961522ba86f9dc90901e47" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.10">
-         <artifact name="kotlin-stdlib-2.0.10.jar">
-            <sha256 value="60f1cefbf1c101676abc9f413f569dad464929d7dc63d5e70e15ae26986e08ac" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.0.10.module">
-            <sha256 value="319fd65cd4fe27603ada96a56af22c94c86f132e70b5b4ad00ef4b2b80b95bc9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.4.21">
          <artifact name="kotlin-stdlib-common-1.4.21.jar">
             <sha256 value="812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff" origin="Generated by Gradle"/>
@@ -8510,11 +8483,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f93c9e9abf8d52d8e8fd8e851aa802ecec55132161c4aeee7d3cd924bf794246" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.0.10">
-         <artifact name="kotlin-stdlib-common-2.0.10.module">
-            <sha256 value="ab210c7fce363f8d8facec3d7e8f764bd09e6cf8fbad7c9e3c047567c5de05fc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.4.10">
          <artifact name="kotlin-stdlib-jdk7-1.4.10.jar">
             <sha256 value="f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b" origin="Generated by Gradle"/>

diff --git a/...rvice/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java b/...rvice/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/...rvice/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/...rvice/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
@@ -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 {