From 388f2971e97a3d36bf210883654abfb12fe0353d Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Thu, 22 Jun 2023 09:41:26 -0400
Subject: [PATCH] Allow libsignal-service to build with JDK17.

---
 dependencies.gradle              |  4 ++--
 gradle/verification-metadata.xml | 16 +++++++++++++---
 libsignal/service/build.gradle   | 14 +++++++-------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 2a338a9981..a39109f833 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -127,7 +127,7 @@ dependencyResolutionManagement {
             library('rxjava3-rxandroid', 'io.reactivex.rxjava3:rxandroid:3.0.0')
             library('rxjava3-rxkotlin', 'io.reactivex.rxjava3:rxkotlin:3.0.1')
             library('rxdogtag', 'com.uber.rxdogtag2:rxdogtag:2.0.1')
-            library('conscrypt-android', 'org.conscrypt:conscrypt-android:2.0.0')
+            library('conscrypt-android', 'org.conscrypt:conscrypt-android:2.5.2')
             library('mobilecoin', 'com.mobilecoin:android-sdk:5.0.0')
             library('leolin-shortcutbadger', 'me.leolin:ShortcutBadger:1.1.22')
             library('emilsjolander-stickylistheaders', 'se.emilsjolander:stickylistheaders:2.7.0')
@@ -192,7 +192,7 @@ dependencyResolutionManagement {
             library('mockk', 'io.mockk:mockk:1.13.2')
             library('mockk-android', 'io.mockk:mockk-android:1.13.2')
 
-            library('conscrypt-openjdk-uber', 'org.conscrypt:conscrypt-openjdk-uber:2.0.0')
+            library('conscrypt-openjdk-uber', 'org.conscrypt:conscrypt-openjdk-uber:2.5.2')
         }
 
         lintLibs {
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e729dc929e..b03a6f9ccf 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1693,12 +1693,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
          <artifact name="aapt2-8.0.0-9289358-linux.jar">
             <sha256 value="28a0a45b05fd15fff817ea3a0c9b4aba8ed9230fec3f8537700fca95ad4c02b4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-8.0.0-9289358-windows.jar">
-            <sha256 value="020ec9c8c464785b9ca52b848b5a12cc7f0fea9c6879b4b1d335404c9a8ef652" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="aapt2-8.0.0-9289358-osx.jar">
             <sha256 value="a062c72c90b8db48fa25fdbcd22a28f2921bc9deb83df6dd86baf0ec03654feb" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="aapt2-8.0.0-9289358-windows.jar">
+            <sha256 value="020ec9c8c464785b9ca52b848b5a12cc7f0fea9c6879b4b1d335404c9a8ef652" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="7.0.0-beta04-7396180">
          <artifact name="aapt2-proto-7.0.0-beta04-7396180.jar">
@@ -3948,11 +3948,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="400ca559a49b860a82862b22cee0e3110764bdcf7ee7c79e7479895c25cdfc09" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.conscrypt" name="conscrypt-android" version="2.5.2">
+         <artifact name="conscrypt-android-2.5.2.aar">
+            <sha256 value="42d18979caf53f5ef68548c76d4c98b41adb910a32ad9448133f9c5b20bd65a3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.0.0">
          <artifact name="conscrypt-openjdk-uber-2.0.0.jar">
             <sha256 value="3d5fd194771c50c60c24126d1d013b23e62f9ba016ad956218707d762589a01c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.5.2">
+         <artifact name="conscrypt-openjdk-uber-2.5.2.jar">
+            <sha256 value="eaf537d98e033d0f0451cd1b8cc74e02d7b55ec882da63c88060d806ba89c348" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ec4j.core" name="ec4j-core" version="0.3.0">
          <artifact name="ec4j-core-0.3.0.jar">
             <sha256 value="cadef0207077074b11a12be442f89ab6cf93fbc2f848702d9371a9611414d558" origin="Generated by Gradle"/>
diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle
index 39bd9c5b05..ff53305d35 100644
--- a/libsignal/service/build.gradle
+++ b/libsignal/service/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 apply plugin: 'java-library'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 apply plugin: 'java-test-fixtures'
@@ -15,18 +17,16 @@ group            = lib_signal_service_group_info
 java {
     withJavadocJar()
     withSourcesJar()
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+tasks.withType(KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = "11"
     }
 }
 
-compileJava {
-    options.release = 11
-}
-
 configurations {
     ideaTestFixturesImplementation { extendsFrom testFixturesImplementation; canBeConsumed false; canBeResolved true }
 }