From 26aeb3f98c61da8b5ce7d8acccea891e0a34d6bf Mon Sep 17 00:00:00 2001 From: Roman Shterenzon Date: Mon, 1 Jul 2019 15:06:56 +0300 Subject: [PATCH 1/2] Support facebook-android-sdk >= 5 --- library/build.gradle | 2 +- .../src/main/java/com/parse/facebook/FacebookController.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 46c81c7..5f79cd0 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,7 +14,7 @@ android { dependencies { api "com.github.parse-community.Parse-SDK-Android:parse:1.19.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' diff --git a/library/src/main/java/com/parse/facebook/FacebookController.java b/library/src/main/java/com/parse/facebook/FacebookController.java index 847f9a4..197d2d2 100644 --- a/library/src/main/java/com/parse/facebook/FacebookController.java +++ b/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 authData) permissions, null, null, + AccessTokenSource.DEVICE_AUTH, parseDateString(authData.get(KEY_EXPIRATION_DATE)), null, null); facebookSdkDelegate.setCurrentAccessToken(accessToken); From 60797800c463077773677bedbc091d7bf0a4810b Mon Sep 17 00:00:00 2001 From: Roman Shterenzon Date: Mon, 1 Jul 2019 17:31:23 +0300 Subject: [PATCH 2/2] Fix tests, update gradle --- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 2 +- .../java/com/parse/facebook/FacebookControllerTest.java | 4 ++++ .../java/com/parse/facebook/ParseFacebookUtilsTest.java | 2 ++ library/src/test/java/com/parse/facebook/TestUtils.java | 4 +++- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 517c195..c64f53e 100644 --- a/build.gradle +++ b/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 { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 35e67d4..9d00ff1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/library/build.gradle b/library/build.gradle index 5f79cd0..9c2f69b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -12,7 +12,7 @@ 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:5.1.0' diff --git a/library/src/test/java/com/parse/facebook/FacebookControllerTest.java b/library/src/test/java/com/parse/facebook/FacebookControllerTest.java index 5ecc3db..b6f75fe 100644 --- a/library/src/test/java/com/parse/facebook/FacebookControllerTest.java +++ b/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); diff --git a/library/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java b/library/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java index 0899e40..0a70367 100644 --- a/library/src/test/java/com/parse/facebook/ParseFacebookUtilsTest.java +++ b/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 { diff --git a/library/src/test/java/com/parse/facebook/TestUtils.java b/library/src/test/java/com/parse/facebook/TestUtils.java index d4a4a0d..4cb49a6 100644 --- a/library/src/test/java/com/parse/facebook/TestUtils.java +++ b/library/src/test/java/com/parse/facebook/TestUtils.java @@ -9,12 +9,13 @@ 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", @@ -22,6 +23,7 @@ public static AccessToken newAccessToken() { null, null, null, + AccessTokenSource.DEVICE_AUTH, null, null, null