Skip to content
This repository has been archived by the owner on Aug 3, 2019. It is now read-only.

Gradle and dependency updates. #421

Open
wants to merge 27 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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). <br>

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.
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.android.tools.build:gradle:2.3.1'
}
}

allprojects {
repositories {
jcenter()
}
tasks.withType(Javadoc).all { enabled = false }
}
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +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.10-all.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
10 changes: 5 additions & 5 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 25
buildToolsVersion "25.0.2"

defaultConfig {
applicationId "com.sromku.simple.fb.example"
minSdkVersion 15
targetSdkVersion 23
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
Expand All @@ -30,6 +30,6 @@ allprojects {
dependencies {
compile project(':simple-fb')
// compile project(':facebook')
// compile 'com.sromku:simple-fb:4.2.+'
// compile 'com.facebook.android:facebook-android-sdk:4.11.+'
// compile 'com.sromku:simple-fb:4.0.+'
// compile 'com.facebook.android:facebook-android-sdk:4.6.+'
}
19 changes: 9 additions & 10 deletions simple-fb/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
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'
Expand All @@ -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'
Expand All @@ -52,9 +52,9 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
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'
}
}

Expand All @@ -65,8 +65,7 @@ allprojects {
}

dependencies {
compile 'com.facebook.android:facebook-android-sdk:4.11.+'
// compile project(':facebook')
compile 'com.google.code.gson:gson:2.2.+'
compile 'com.facebook.android:facebook-android-sdk:4.22.0'
compile 'com.google.code.gson:gson:2.7'
}

Original file line number Diff line number Diff line change
Expand Up @@ -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() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ public class Education {
private String mType;

public String getSchool() {
return mSchool.getName();
return mSchool == null ? null : mSchool.getName();
}

public String getDegree() {
return mDegree == null ? null : mDegree.getName();
}

public String getYear() {
return mYear.getName();
return mYear == null ? null : mYear.getName();
}

public List<String> getConcentrations() {
Expand Down