From 90dd6b7cb3d12a67466d0ae0d4999d663150f111 Mon Sep 17 00:00:00 2001
From: Rashad Sookram <rashad@signal.org>
Date: Mon, 21 Mar 2022 11:00:07 -0400
Subject: [PATCH] Compile against API level 31.

---
 .../securesms/webrtc/audio/SignalBluetoothManager.kt        | 2 ++
 build.gradle                                                | 4 ++--
 reproducible-builds/Dockerfile                              | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalBluetoothManager.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalBluetoothManager.kt
index 769b646765..53b6918911 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalBluetoothManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalBluetoothManager.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.webrtc.audio
 
+import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothHeadset
@@ -19,6 +20,7 @@ import java.util.concurrent.TimeUnit
  * reports that to the [SignalAudioManager], and then handles connecting/disconnecting
  * to the device if requested by [SignalAudioManager].
  */
+@SuppressLint("MissingPermission") // targetSdkVersion is still 30 (https://issuetracker.google.com/issues/201454155)
 class SignalBluetoothManager(
   private val context: Context,
   private val audioManager: FullSignalAudioManager,
diff --git a/build.gradle b/build.gradle
index 2142695950..94eb2a9d9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,9 +31,9 @@ buildscript {
 }
 
 ext {
-    BUILD_TOOL_VERSION = '30.0.2'
+    BUILD_TOOL_VERSION = '31.0.0'
 
-    COMPILE_SDK = 30
+    COMPILE_SDK = 31
     TARGET_SDK  = 30
     MINIMUM_SDK = 19
 
diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile
index 7d076abf5e..b8c3af9378 100644
--- a/reproducible-builds/Dockerfile
+++ b/reproducible-builds/Dockerfile
@@ -11,8 +11,8 @@ RUN apt-get update -y && apt-get install -y $(cat docker/dependencies.txt)
 RUN docker/print-versions.sh docker/dependencies.txt
 
 ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-7583922_latest.zip
-ENV ANDROID_API_LEVELS                  android-30
-ENV ANDROID_BUILD_TOOLS_VERSION         30.0.2
+ENV ANDROID_API_LEVELS                  android-31
+ENV ANDROID_BUILD_TOOLS_VERSION         31.0.0
 
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV PATH         ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin
@@ -26,7 +26,7 @@ RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
 RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "extras;google;m2repository" "extras;android;m2repository" "extras;google;google_play_services"
 
 RUN update-java-alternatives -s java-1.8.0-openjdk-amd64
-RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager --licenses --sdk_root="${ANDROID_HOME}"
+RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}"
 RUN update-java-alternatives -s java-1.11.0-openjdk-amd64
 
 RUN rm -rf ${ANDROID_HOME}/tools