From 7ebaeb5ca8546aa468b0ea65739a6c47a7fe00c0 Mon Sep 17 00:00:00 2001
From: Zilin Zhang <kylinchang@fb.com>
Date: Mon, 2 Dec 2019 10:57:30 -0800
Subject: [PATCH] Update version for Android

Summary:
Per Google's requirements:
https://support.google.com/googleplay/android-developer/answer/113469#targetsdk

Reviewed By: Oliverccccct

Differential Revision: D18747134

fbshipit-source-id: 9829744e6f1e27ec637add1fb4f3aef1f9908920
---
 facebook-android-wrapper/build.gradle          | 18 +++++++++---------
 .../src/com/facebook/unity/FB.java             |  1 -
 scripts/setup_android_unity_plugin.sh          |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/facebook-android-wrapper/build.gradle b/facebook-android-wrapper/build.gradle
index 46f416d92..36aab1c11 100644
--- a/facebook-android-wrapper/build.gradle
+++ b/facebook-android-wrapper/build.gradle
@@ -44,23 +44,23 @@ dependencies {
     // Use local file instead of maven to enable testing with versions
     // not released to maven.
     if (project.hasProperty("localRepo")) {
-        compile 'com.facebook.android:facebook-android-sdk:' + fbSdkVersion + '@aar'
-        compile 'com.android.support:support-v4:25.0.0'
-        compile 'com.android.support:cardview-v7:25.0.0'
-        compile 'com.android.support:customtabs:25.0.0'
-        compile 'com.parse.bolts:bolts-android:1.8.4'
+        implementation 'com.facebook.android:facebook-android-sdk:' + fbSdkVersion + '@aar'
+        implementation 'com.android.support:support-v4:25.0.0'
+        implementation 'com.android.support:cardview-v7:25.0.0'
+        implementation 'com.android.support:customtabs:25.0.0'
+        implementation 'com.parse.bolts:bolts-android:1.8.4'
     } else {
-        compile 'com.facebook.android:facebook-android-sdk:' + fbSdkVersion
+        implementation 'com.facebook.android:facebook-android-sdk:[5,6)'
     }
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.0'
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 28
     }
 
     compileOptions {
diff --git a/facebook-android-wrapper/src/com/facebook/unity/FB.java b/facebook-android-wrapper/src/com/facebook/unity/FB.java
index 7766c7f65..af919aa49 100644
--- a/facebook-android-wrapper/src/com/facebook/unity/FB.java
+++ b/facebook-android-wrapper/src/com/facebook/unity/FB.java
@@ -33,7 +33,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.test.ActivityTestCase;
 import android.util.Log;
 import android.util.Base64;
 import android.content.pm.*;
diff --git a/scripts/setup_android_unity_plugin.sh b/scripts/setup_android_unity_plugin.sh
index 0f6d3d431..3ae185aa3 100755
--- a/scripts/setup_android_unity_plugin.sh
+++ b/scripts/setup_android_unity_plugin.sh
@@ -53,8 +53,8 @@ if [ "$localBuild" = true ]; then
   ./gradlew clean -PlocalRepo=libs -PsdkVersion="$FB_ANDROID_SDK_VERSION" || die "Failed to perform gradle clean"
   ./gradlew assemble -PlocalRepo=libs -PsdkVersion="$FB_ANDROID_SDK_VERSION" || die "Failed to build facebook android wrapper"
 else
-  ./gradlew clean -PsdkVersion="$FB_ANDROID_SDK_VERSION" || die "Failed to perform gradle clean"
-  ./gradlew assemble -PsdkVersion="$FB_ANDROID_SDK_VERSION" || die "Failed to build facebook android wrapper"
+  ./gradlew clean || die "Failed to perform gradle clean"
+  ./gradlew assemble || die "Failed to build facebook android wrapper"
 fi
 popd