From 3f16da4db01b49531294d979e74008bc481a600e Mon Sep 17 00:00:00 2001
From: Pascal Hartig <phartig@rdrei.net>
Date: Fri, 19 Feb 2021 03:28:24 -0800
Subject: [PATCH] Upgrade gradle plugin (#1936)

Summary:
Upgraded to the latest Android Studio and this popped up.

Pull Request resolved: https://github.com/facebook/flipper/pull/1936

Test Plan:
Built the sample app.

Repro'd the previous build failure. Weirdly enough, this only occurred on Linux, not on my Mac. Now it's passing.

Reviewed By: mweststrate

Differential Revision: D26483694

Pulled By: passy

fbshipit-source-id: 9c27eb6d28a0f390154899d67469a504d68c2ad4
---
 android/build.gradle                     | 7 ++++---
 build.gradle                             | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index aeaf1a7f8..e50598fd2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -60,9 +60,10 @@ android {
 
     dependencies {
         compileOnly deps.proguardAnnotations
-        implementation 'com.facebook.fbjni:fbjni:0.0.2'
-        extractHeaders 'com.facebook.fbjni:fbjni:0.0.2:headers'
-        extractJNI 'com.facebook.fbjni:fbjni:0.0.2'
+        // Temporary until we upgrade to prefabs: https://developer.android.com/studio/releases/gradle-plugin#native-dependencies
+        implementation 'com.facebook.fbjni:fbjni-java-only:0.0.4'
+        extractHeaders 'com.facebook.fbjni:fbjni:0.0.4:headers'
+        extractJNI 'com.facebook.fbjni:fbjni:0.0.4'
         implementation deps.soloader
         implementation deps.jsr305
         implementation deps.supportAppCompat
diff --git a/build.gradle b/build.gradle
index 673a0eb17..322101213 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
     }
@@ -51,7 +51,7 @@ ext {
     targetSdkVersion = 29
     compileSdkVersion = 29
     buildToolsVersion = '29.0.2'
-    ndkVersion = '20.0.5594570'
+    ndkVersion = '21.3.6528147'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 822e6801a..2fbff42e0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip