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

Gradle and dependency updates. #420

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8a28b58
Gradle and dependency updates.
Apr 17, 2016
ebce854
Update gradle versions
sromku Apr 17, 2016
8f64dfc
Update to fb version 4.11.0
sromku Apr 17, 2016
6e23697
Merge branch 'dev' of https://github.com/sromku/android-simple-facebo…
Apr 17, 2016
c4602a9
Merge branch 'master' of https://github.com/sromku/android-simple-fac…
Apr 19, 2016
364769e
Gradle plugin update, null check for Education school name & year.
Jun 25, 2016
ad29816
Update gradle distribution version
Jun 25, 2016
6df4f4c
Update maven plugin
Jun 25, 2016
fccb6e4
Updated facebook sdk
Jun 25, 2016
d93e849
Updated bintray plugin version
Jun 25, 2016
7cf0b11
Build test
Jun 26, 2016
4a04909
Added javadoc build test
Jun 26, 2016
7f323fd
Added javadoc build task with override
Jun 26, 2016
a889487
Downgrade gradle version
Jun 26, 2016
f19c44c
Removed applied maven plugin
Jun 26, 2016
c591138
Removed javadoc task
Jun 26, 2016
6634b69
Revert
Jun 26, 2016
521019e
Merge remote-tracking branch 'origin/master'
Jun 26, 2016
f12ae08
Fix dependency location
Jun 26, 2016
4211666
null check for Education school name & year.
Jun 25, 2016
cfb099f
Update gradle distribution
Jun 27, 2016
9dbb27d
Disable javadoc failOnError
Jun 27, 2016
fec7719
Move javadoc task to buildscript
Jun 27, 2016
44311ca
Disable javadoc.
Jun 27, 2016
c24f8c0
Merge branch 'master' into dev
Jun 27, 2016
ceda212
Update library version
Jun 27, 2016
5dc12c0
Merge branch 'master' into dev
Jun 27, 2016
3cf9fb9
Version update, graph api version bug fix.
Apr 22, 2017
135b446
Merge branch 'upstream-master'
Apr 22, 2017
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: 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:1.2.3'
classpath 'com.android.tools.build:gradle:2.3.1'
}
}

allprojects {
repositories {
jcenter()
}
tasks.withType(Javadoc).all { enabled = false }
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6 changes: 3 additions & 3 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.1"
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 Down
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.1"
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.1.1'
libraryVersion = '4.2.1'

developerId = 'sromku'
developerName = 'Roman Kushnarenko'
Expand All @@ -52,9 +52,9 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
classpath 'com.github.dcendents:android-maven-plugin: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'
}
}

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

dependencies {
compile 'com.facebook.android:facebook-android-sdk:4.7.+'
// compile project(':facebook')
compile 'com.google.code.gson:gson:1.7.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