Merge pull request #51 from romanbsd/master

Support facebook-android-sdk >= 5

Author: rogerhu

build.gradle

@@ -4,14 +4,14 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
 plugins {
-    id 'com.github.ben-manes.versions' version '0.20.0'
+    id 'com.github.ben-manes.versions' version '0.21.0'
 }
 
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed May 30 23:22:49 PDT 2018
+#Sun May 26 12:48:07 IDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

library/build.gradle

@@ -12,9 +12,9 @@ android {
 }
 
 dependencies {
-    api "com.github.parse-community.Parse-SDK-Android:parse:1.19.0"
+    api "com.github.parse-community.Parse-SDK-Android:parse:1.20.0"
 
-    api 'com.facebook.android:facebook-android-sdk:4.40.0'
+    api 'com.facebook.android:facebook-android-sdk:5.1.0'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:1.10.19'

library/src/main/java/com/parse/facebook/FacebookController.java

@@ -15,6 +15,7 @@
 import android.text.TextUtils;
 
 import com.facebook.AccessToken;
+import com.facebook.AccessTokenSource;
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
@@ -221,6 +222,7 @@ public void setAuthData(Map<String, String> authData)
                 permissions,
                 null,
                 null,
+                AccessTokenSource.DEVICE_AUTH,
                 parseDateString(authData.get(KEY_EXPIRATION_DATE)),
                 null, null);
         facebookSdkDelegate.setCurrentAccessToken(accessToken);

library/src/test/java/com/parse/facebook/FacebookControllerTest.java

@@ -13,6 +13,7 @@
 import android.support.v4.app.Fragment;
 
 import com.facebook.AccessToken;
+import com.facebook.AccessTokenSource;
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
@@ -25,6 +26,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -51,6 +53,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+@Config(manifest=Config.NONE)
 @RunWith(RobolectricTestRunner.class)
 public class FacebookControllerTest {
 
@@ -99,6 +102,7 @@ public void testGetAuthData() {
                 permissions,
                 null,
                 null,
+                AccessTokenSource.DEVICE_AUTH,
                 calendar.getTime(),
                 null, null);
 

library/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java

@@ -25,6 +25,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -48,6 +49,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@Config(manifest=Config.NONE)
 @RunWith(RobolectricTestRunner.class)
 public class ParseFacebookUtilsTest {
 

library/src/test/java/com/parse/facebook/TestUtils.java

@@ -9,19 +9,21 @@
 package com.parse.facebook;
 
 import com.facebook.AccessToken;
+import com.facebook.AccessTokenSource;
 
 /**
  * package
  */
 class TestUtils {
-    public static AccessToken newAccessToken() {
+    static AccessToken newAccessToken() {
         return new AccessToken(
                 "test_token",
                 "test_application_id",
                 "test_id",
                 null,
                 null,
                 null,
+                AccessTokenSource.DEVICE_AUTH,
                 null,
                 null,
                 null