From 7f17b66a6cc05529c36ed5afddfc28fb4033c02e Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Fri, 1 May 2020 15:20:35 -0300
Subject: [PATCH] Upgrade gradle and gradle plugin.

---
 .github/workflows/android.yml                        |  6 ++++++
 app/build.gradle                                     |  2 +-
 app/lint.xml                                         |  3 +++
 .../securesms/components/AccessibleToggleButton.java | 12 +++---------
 gradle/wrapper/gradle-wrapper.properties             |  4 ++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0b2b98b85..037ac23c0 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,11 +14,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+
     - name: set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+
+    - name: Install NDK
+      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
+
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
+
     - name: Build with Gradle
       run: ./gradlew qa
diff --git a/app/build.gradle b/app/build.gradle
index 39b725777..a45d2e4ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
     }
diff --git a/app/lint.xml b/app/lint.xml
index 66a887aa4..2c8035253 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -20,6 +20,9 @@
     <issue id="RestrictedApi" severity="error">
         <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
         <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
+        <ignore path="*/org/thoughtcrime/securesms/conversation/*.java" />
+        <ignore path="*/org/thoughtcrime/securesms/lock/v2/CreateKbsPinViewModel.java" />
+        <ignore path="*/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java" />
     </issue>
 
 </lint>
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java b/app/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
index 70c0f7325..b02e0894c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
@@ -2,20 +2,14 @@ package org.thoughtcrime.securesms.components;
 
 
 import android.content.Context;
-import android.os.Build;
-import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
-import android.widget.ToggleButton;
 
-public class AccessibleToggleButton extends ToggleButton {
+import androidx.appcompat.widget.AppCompatToggleButton;
+
+public class AccessibleToggleButton extends AppCompatToggleButton {
 
   private OnCheckedChangeListener listener;
 
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public AccessibleToggleButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-  }
-
   public AccessibleToggleButton(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
   }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5088094a6..8d8fc5e43 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 # Note: Check https://gradle.org/release-checksums/ before updating wrapper or distribution
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=027fdd265d277bae65a0d349b6b8da02135b0b8e14ba891e26281fa877fe37a2
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionSha256Sum=abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists