From 8a28b58898ecdc2aa0aa1ef55e9fd9956b481d20 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 17 Apr 2016 15:40:20 -0400 Subject: [PATCH 01/22] Gradle and dependency updates. --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- sample/build.gradle | 2 +- simple-fb/build.gradle | 11 ++++++----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index c0b83ec..581bed5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:2.1.0-beta1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..d570517 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index a74a955..4ba2646 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion "23.0.3" defaultConfig { applicationId "com.sromku.simple.fb.example" diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 5095f33..270ba82 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion "23.0.3" defaultConfig { minSdkVersion 15 @@ -52,9 +52,10 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:2.1.0-beta1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' - classpath 'com.github.dcendents:android-maven-plugin:1.2' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + } } @@ -65,8 +66,8 @@ allprojects { } dependencies { - compile 'com.facebook.android:facebook-android-sdk:4.7.+' + compile 'com.facebook.android:facebook-android-sdk:4.11.0' // compile project(':facebook') - compile 'com.google.code.gson:gson:1.7.2' + compile 'com.google.code.gson:gson:2.4' } From 1ca617e0e54c26be4bf40b4c4903ca0a7cfc5c0d Mon Sep 17 00:00:00 2001 From: Roman Kushnarenko Date: Mon, 18 Apr 2016 10:14:27 +0300 Subject: [PATCH 02/22] Update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ec9da14..df0caac 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ android-simple-facebook ======================= +#### Currently this lib was tested and works with graph api `v2.3` and below. In the future, I will make the needed changes to support latest changes on FB side. Currently, I don't have much time to maintain. PRs are welcomed. + + Simple Facebook SDK for Android which wraps original [**Facebook SDK**](https://github.com/facebook/facebook-android-sdk).
This is a library project which makes the life much easier by coding less code for being able to login, publish feeds and open graph stories, invite friends and more. From 364769e710f3d72bd0483d73b9f7dd404f130920 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Fri, 24 Jun 2016 22:53:03 -0400 Subject: [PATCH 03/22] Gradle plugin update, null check for Education school name & year. --- build.gradle | 2 +- simple-fb/build.gradle | 2 +- .../main/java/com/sromku/simple/fb/entities/Education.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 581bed5..a83d015 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0-beta1' + classpath 'com.android.tools.build:gradle:2.1.2' } } diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 270ba82..3e9d2fb 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -52,7 +52,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0-beta1' + classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' diff --git a/simple-fb/src/main/java/com/sromku/simple/fb/entities/Education.java b/simple-fb/src/main/java/com/sromku/simple/fb/entities/Education.java index 1b9a416..8f76c8f 100644 --- a/simple-fb/src/main/java/com/sromku/simple/fb/entities/Education.java +++ b/simple-fb/src/main/java/com/sromku/simple/fb/entities/Education.java @@ -37,7 +37,7 @@ public class Education { private String mType; public String getSchool() { - return mSchool.getName(); + return mSchool == null ? null : mSchool.getName(); } public String getDegree() { @@ -45,7 +45,7 @@ public String getDegree() { } public String getYear() { - return mYear.getName(); + return mYear == null ? null : mYear.getName(); } public List getConcentrations() { From ad29816066617bc4bdee6de92094d57a7babd6b6 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Fri, 24 Jun 2016 23:15:34 -0400 Subject: [PATCH 04/22] Update gradle distribution version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d570517..4c74aab 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip From 6df4f4c7cfab1ac37c065138282a380add1985fc Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Fri, 24 Jun 2016 23:51:20 -0400 Subject: [PATCH 05/22] Update maven plugin --- simple-fb/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 3e9d2fb..9277012 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -54,7 +54,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4' } } From fccb6e423338002770392de148cc5fa0fd04f738 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sat, 25 Jun 2016 00:01:07 -0400 Subject: [PATCH 06/22] Updated facebook sdk --- simple-fb/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 9277012..cbb2c44 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -66,7 +66,7 @@ allprojects { } dependencies { - compile 'com.facebook.android:facebook-android-sdk:4.11.0' + compile 'com.facebook.android:facebook-android-sdk:4.13.1' // compile project(':facebook') compile 'com.google.code.gson:gson:2.4' } From d93e8490a0682f9803bacb29b21976eeaee0372b Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sat, 25 Jun 2016 00:29:32 -0400 Subject: [PATCH 07/22] Updated bintray plugin version --- simple-fb/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index cbb2c44..66b18b6 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -53,7 +53,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.1.2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4' } From 7cf0b116599f4708ee142227460c424aa67e6771 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 17:19:20 -0400 Subject: [PATCH 08/22] Build test --- simple-fb/build.gradle | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 66b18b6..c22b302 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -44,6 +44,13 @@ ext { allLicenses = ["Apache-2.0"] } + +dependencies { + compile 'com.facebook.android:facebook-android-sdk:4.13.1' + // compile project(':facebook') + compile 'com.google.code.gson:gson:2.4' +} + apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' @@ -65,9 +72,3 @@ allprojects { } } -dependencies { - compile 'com.facebook.android:facebook-android-sdk:4.13.1' - // compile project(':facebook') - compile 'com.google.code.gson:gson:2.4' -} - From 4a04909b199cb64bfe2b9b581eb1d1186f0beb5b Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 17:45:01 -0400 Subject: [PATCH 09/22] Added javadoc build test --- simple-fb/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index c22b302..f2a56b1 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -66,6 +66,12 @@ buildscript { } } +task javadoc1(type: Javadoc) { + failOnError false + source = android.sourceSets.main.java.sourceFiles + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +} + allprojects { repositories { mavenCentral() From 7f323fdfc46d9affefe7045f0a975a1ac631023a Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 17:56:20 -0400 Subject: [PATCH 10/22] Added javadoc build task with override --- simple-fb/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index f2a56b1..43cc832 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' android { compileSdkVersion 23 @@ -66,10 +67,11 @@ buildscript { } } -task javadoc1(type: Javadoc) { +task javadoc(type: Javadoc, overwrite: true) { failOnError false source = android.sourceSets.main.java.sourceFiles classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + classpath += configurations.compile } allprojects { From a8894879505e2e2a4a4e8cf35764dcb1b1dfd9d0 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 18:01:28 -0400 Subject: [PATCH 11/22] Downgrade gradle version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4c74aab..d570517 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip From f19c44cb09ba86f5329262d411e6db2f94b019e9 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 18:14:08 -0400 Subject: [PATCH 12/22] Removed applied maven plugin --- simple-fb/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 43cc832..ce71b08 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' android { compileSdkVersion 23 @@ -63,7 +62,6 @@ buildscript { classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4' - } } From c591138c006992d4c185253bd8de31676a2cae14 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 18:17:03 -0400 Subject: [PATCH 13/22] Removed javadoc task --- simple-fb/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index ce71b08..556a000 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -65,12 +65,12 @@ buildscript { } } -task javadoc(type: Javadoc, overwrite: true) { +/*task javadoc(type: Javadoc, overwrite: true) { failOnError false source = android.sourceSets.main.java.sourceFiles classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += configurations.compile -} +}*/ allprojects { repositories { From 6634b690df74a3d15213e189cc73b675d3b2196d Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 18:22:50 -0400 Subject: [PATCH 14/22] Revert --- simple-fb/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index c22b302..0f9c4ef 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -62,7 +62,6 @@ buildscript { classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4' - } } From f12ae080bd21bfeb524649af0628db3340f827c8 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 18:23:27 -0400 Subject: [PATCH 15/22] Fix dependency location --- simple-fb/build.gradle | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 556a000..157e521 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -44,13 +44,6 @@ ext { allLicenses = ["Apache-2.0"] } - -dependencies { - compile 'com.facebook.android:facebook-android-sdk:4.13.1' - // compile project(':facebook') - compile 'com.google.code.gson:gson:2.4' -} - apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' @@ -78,3 +71,9 @@ allprojects { } } +dependencies { + compile 'com.facebook.android:facebook-android-sdk:4.13.1' + // compile project(':facebook') + compile 'com.google.code.gson:gson:2.4' +} + From 421166608bd9eab9ede062e61ab1677c37ddb073 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Fri, 24 Jun 2016 22:53:03 -0400 Subject: [PATCH 16/22] null check for Education school name & year. (cherry picked from commit 364769e) --- .../main/java/com/sromku/simple/fb/entities/Education.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simple-fb/src/main/java/com/sromku/simple/fb/entities/Education.java b/simple-fb/src/main/java/com/sromku/simple/fb/entities/Education.java index 1b9a416..8f76c8f 100644 --- a/simple-fb/src/main/java/com/sromku/simple/fb/entities/Education.java +++ b/simple-fb/src/main/java/com/sromku/simple/fb/entities/Education.java @@ -37,7 +37,7 @@ public class Education { private String mType; public String getSchool() { - return mSchool.getName(); + return mSchool == null ? null : mSchool.getName(); } public String getDegree() { @@ -45,7 +45,7 @@ public String getDegree() { } public String getYear() { - return mYear.getName(); + return mYear == null ? null : mYear.getName(); } public List getConcentrations() { From cfb099f5b8a48e5e4048130f148f8270d22a8595 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 20:46:26 -0400 Subject: [PATCH 17/22] Update gradle distribution --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d570517..4c74aab 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip From 9dbb27d8d1ebd2f3d7f66faebba78ebb6db3888e Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 20:57:02 -0400 Subject: [PATCH 18/22] Disable javadoc failOnError --- simple-fb/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 157e521..424f519 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -58,12 +58,12 @@ buildscript { } } -/*task javadoc(type: Javadoc, overwrite: true) { +task javadoc(type: Javadoc, overwrite: true) { failOnError false source = android.sourceSets.main.java.sourceFiles classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += configurations.compile -}*/ +} allprojects { repositories { From fec7719e3dd1451553685c1eb080158f2ec524ea Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 21:08:30 -0400 Subject: [PATCH 19/22] Move javadoc task to buildscript --- simple-fb/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 424f519..652a250 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -56,13 +56,13 @@ buildscript { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4' } -} -task javadoc(type: Javadoc, overwrite: true) { - failOnError false - source = android.sourceSets.main.java.sourceFiles - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile + task javadoc(type: Javadoc, overwrite: true) { + failOnError false + source = android.sourceSets.main.java.sourceFiles + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + classpath += configurations.compile + } } allprojects { From 44311ca9131c34b42e3920b7a9429a3409641fee Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 21:14:25 -0400 Subject: [PATCH 20/22] Disable javadoc. --- build.gradle | 1 + simple-fb/build.gradle | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index a83d015..09c5cfc 100644 --- a/build.gradle +++ b/build.gradle @@ -13,4 +13,5 @@ allprojects { repositories { jcenter() } + tasks.withType(Javadoc).all { enabled = false } } diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index 652a250..ee00bf5 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -56,13 +56,6 @@ buildscript { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4' } - - task javadoc(type: Javadoc, overwrite: true) { - failOnError false - source = android.sourceSets.main.java.sourceFiles - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile - } } allprojects { From ceda212ceb5e9fd3eb9f3e6b3930d481bdcfd897 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sun, 26 Jun 2016 21:18:36 -0400 Subject: [PATCH 21/22] Update library version --- simple-fb/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index ee00bf5..cc80a2d 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -33,7 +33,7 @@ ext { siteUrl = 'https://github.com/sromku/android-simple-facebook' gitUrl = 'https://github.com/sromku/android-simple-facebook.git' - libraryVersion = '4.1.1' + libraryVersion = '4.2.0' developerId = 'sromku' developerName = 'Roman Kushnarenko' From 3cf9fb9ada7173a4f1447b088684c5c6bf585803 Mon Sep 17 00:00:00 2001 From: xsorifc28 Date: Sat, 22 Apr 2017 01:41:14 -0400 Subject: [PATCH 22/22] Version update, graph api version bug fix. --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- sample/build.gradle | 6 +++--- simple-fb/build.gradle | 15 +++++++-------- .../simple/fb/SimpleFacebookConfiguration.java | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 09c5cfc..53c1df0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.3.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4c74aab..775f10d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Sat Apr 22 01:25:33 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index 4ba2646..f4f87f4 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { applicationId "com.sromku.simple.fb.example" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 25 versionCode 1 versionName "1.0" } diff --git a/simple-fb/build.gradle b/simple-fb/build.gradle index cc80a2d..be328f1 100644 --- a/simple-fb/build.gradle +++ b/simple-fb/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 25 versionName project.VERSION_NAME versionCode Integer.parseInt(project.VERSION_CODE) consumerProguardFiles 'consumer-proguard-rules.pro', 'gson.pro', 'simple-fb.pro' @@ -33,7 +33,7 @@ ext { siteUrl = 'https://github.com/sromku/android-simple-facebook' gitUrl = 'https://github.com/sromku/android-simple-facebook.git' - libraryVersion = '4.2.0' + libraryVersion = '4.2.1' developerId = 'sromku' developerName = 'Roman Kushnarenko' @@ -52,7 +52,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4' } @@ -65,8 +65,7 @@ allprojects { } dependencies { - compile 'com.facebook.android:facebook-android-sdk:4.13.1' - // compile project(':facebook') - compile 'com.google.code.gson:gson:2.4' + compile 'com.facebook.android:facebook-android-sdk:4.22.0' + compile 'com.google.code.gson:gson:2.7' } diff --git a/simple-fb/src/main/java/com/sromku/simple/fb/SimpleFacebookConfiguration.java b/simple-fb/src/main/java/com/sromku/simple/fb/SimpleFacebookConfiguration.java index 602c2f6..ece9b98 100644 --- a/simple-fb/src/main/java/com/sromku/simple/fb/SimpleFacebookConfiguration.java +++ b/simple-fb/src/main/java/com/sromku/simple/fb/SimpleFacebookConfiguration.java @@ -163,7 +163,7 @@ public static class Builder { private boolean mAllAtOnce = false; private boolean mUseAppsecretProof = false; private String mAppSecret = null; - private String mGraphVersion = ServerProtocol.getAPIVersion(); + private String mGraphVersion = ServerProtocol.getDefaultAPIVersion(); public Builder() { }