Merge pull request #17 from ParsePlatform/update_latest_sdks_nov_2014

stanleyw · stanleyw · commit 311f62c9cd4d · 2014-12-02T14:16:16.000-08:00
Update SDK/Tools to latest, use Maven instead of git submodule for FB SDK
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "facebook-sdk"]
-	path = facebook-sdk
-	url = git@github.com:facebook/facebook-android-sdk.git
diff --git a/ParseLoginSampleBasic/build.gradle b/ParseLoginSampleBasic/build.gradle
@@ -1,10 +1,9 @@
 apply plugin: 'android'
 
 dependencies {
+    compile 'com.facebook.android:facebook-android-sdk:3.21.0'
     compile project(':ParseLoginUI')
-    compile project(':facebook-sdk:facebook')
-    compile 'com.android.support:support-v4:13.0.+'
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile 'com.android.support:support-v4:21.0.0'
 }
 
 android {
diff --git a/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleApplication.java b/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleApplication.java
@@ -24,7 +24,6 @@
 import android.app.Application;
 
 import com.parse.Parse;
-import com.parse.ParseFacebookUtils;
 import com.parse.ParseTwitterUtils;
 
 public class SampleApplication extends Application {
@@ -37,10 +36,6 @@ public void onCreate() {
 
     Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
 
-    // Optional - If you don't want to allow Facebook login, you can
-    // remove this line (and other related ParseFacebookUtils calls)
-    ParseFacebookUtils.initialize(getString(R.string.facebook_app_id));
-
     // Optional - If you don't want to allow Twitter login, you can
     // remove this line (and other related ParseTwitterUtils calls)
     ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
diff --git a/ParseLoginSampleCodeCustomization/build.gradle b/ParseLoginSampleCodeCustomization/build.gradle
@@ -1,10 +1,9 @@
 apply plugin: 'android'
 
 dependencies {
+    compile 'com.facebook.android:facebook-android-sdk:3.21.0'
     compile project(':ParseLoginUI')
-    compile project(':facebook-sdk:facebook')
-    compile 'com.android.support:support-v4:13.0.+'
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile 'com.android.support:support-v4:21.0.0'
 }
 
 android {
diff --git a/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleApplication.java b/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleApplication.java
@@ -24,7 +24,6 @@
 import android.app.Application;
 
 import com.parse.Parse;
-import com.parse.ParseFacebookUtils;
 import com.parse.ParseTwitterUtils;
 
 public class SampleApplication extends Application {
@@ -37,10 +36,6 @@ public void onCreate() {
 
     Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
 
-    // Optional - If you don't want to allow Facebook login, you can
-    // remove this line (and other related ParseFacebookUtils calls)
-    ParseFacebookUtils.initialize(getString(R.string.facebook_app_id));
-
     // Optional - If you don't want to allow Twitter login, you can
     // remove this line (and other related ParseTwitterUtils calls)
     ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
diff --git a/ParseLoginSampleLayoutOverride/build.gradle b/ParseLoginSampleLayoutOverride/build.gradle
@@ -1,10 +1,9 @@
 apply plugin: 'android'
 
 dependencies {
+    compile 'com.facebook.android:facebook-android-sdk:3.21.0'
     compile project(':ParseLoginUI')
-    compile project(':facebook-sdk:facebook')
-    compile 'com.android.support:support-v4:13.0.+'
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile 'com.android.support:support-v4:21.0.0'
 }
 
 android {
diff --git a/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleApplication.java b/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleApplication.java
@@ -24,7 +24,6 @@
 import android.app.Application;
 
 import com.parse.Parse;
-import com.parse.ParseFacebookUtils;
 import com.parse.ParseTwitterUtils;
 
 public class SampleApplication extends Application {
@@ -37,10 +36,6 @@ public void onCreate() {
 
     Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
 
-    // Optional - If you don't want to allow Facebook login, you can
-    // remove this line (and other related ParseFacebookUtils calls)
-    ParseFacebookUtils.initialize(getString(R.string.facebook_app_id));
-
     // Optional - If you don't want to allow Twitter login, you can
     // remove this line (and other related ParseTwitterUtils calls)
     ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
diff --git a/ParseLoginSampleWithDispatchActivity/build.gradle b/ParseLoginSampleWithDispatchActivity/build.gradle
@@ -1,10 +1,9 @@
 apply plugin: 'android'
 
 dependencies {
+    compile 'com.facebook.android:facebook-android-sdk:3.21.0'
     compile project(':ParseLoginUI')
-    compile project(':facebook-sdk:facebook')
-    compile 'com.android.support:support-v4:13.0.+'
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile 'com.android.support:support-v4:21.0.0'
 }
 
 android {
diff --git a/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleApplication.java b/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleApplication.java
@@ -24,7 +24,6 @@
 import android.app.Application;
 
 import com.parse.Parse;
-import com.parse.ParseFacebookUtils;
 import com.parse.ParseTwitterUtils;
 
 public class SampleApplication extends Application {
@@ -37,10 +36,6 @@ public void onCreate() {
 
     Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
 
-    // Optional - If you don't want to allow Facebook login, you can
-    // remove this line (and other related ParseFacebookUtils calls)
-    ParseFacebookUtils.initialize(getString(R.string.facebook_app_id));
-
     // Optional - If you don't want to allow Twitter login, you can
     // remove this line (and other related ParseTwitterUtils calls)
     ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
diff --git a/ParseLoginUI/build.gradle b/ParseLoginUI/build.gradle
@@ -1,9 +1,11 @@
 apply plugin: 'android-library'
 
 dependencies {
-    compile project(':facebook-sdk:facebook')
-    compile 'com.android.support:support-v4:13.0.+'
+    compile 'com.parse.bolts:bolts-android:1.1.3'
+    compile 'com.android.support:support-v4:21.0.0'
     compile fileTree(dir: 'libs', include: '*.jar')
+
+    provided 'com.facebook.android:facebook-android-sdk:3.21.0'
 }
 
 android {
diff --git a/ParseLoginUI/libs/Parse-1.7.0.jar b/ParseLoginUI/libs/Parse-1.7.0.jar
diff --git a/ParseLoginUI/libs/Parse-1.7.1.jar b/ParseLoginUI/libs/Parse-1.7.1.jar
diff --git a/README.md b/README.md
@@ -2,31 +2,20 @@
 ## Overview
 This project contains the `ParseLoginUI` library for building login and signup flows with the Parse Android SDK.
 You can easily configure the look and feel of the login screens by either specifying XML configurations or constructing an Intent in code.
-To use this project with your app, you should import it as a library project in Android Studio or Eclipse.
+To use this project with your app, you should import it as a library project in Android Studio.
 
 ![sample screens](http://parseui-android.parseapp.com/images/parse_login_sample_screens.png)
 
 We also provide several sample projects demonstrating how to use the `ParseLoginUI` library.  To run these
 sample projects, you need to do the following:
 
 1. Clone this repository onto your machine.
-2. Fetch the Facebook SDK Git submodule by running the following command in your local ParseUI-Android repository directory: `git submodule update --init --recursive`
-3. Import this repository's projects with Android Studio or Eclipse.
-    1. For Android Studio, just import your local ParseUI-Android repository directory.
-    2. For Eclipse, import the following projects.  In the Eclipse import pop-up, be sure to edit the "New Project Name" column to match each sample project's folder name as shown below (or else Eclipse will automatically use the name of the first activity in `AndroidManifest.xml` and cause name collision error "SampleProfileActivity already exists").
-        * `ParseLoginUI`
-        * `ParseLoginSampleBasic`
-        * `ParseLoginSampleCodeCustomization`
-        * `ParseLoginSampleLayoutOverride`
-        * `ParseLoginSampleWithDispatchActivity`
-        * `facebook-sdk/facebook`
-        ![eclipse import](http://parseui-android.parseapp.com/images/eclipse_import_after_edit.png)
-4. Make sure you have Android Build Tools 19.1 installed through Android SDK Manager.  If you are using Android Studio, please also change <code>facebook-sdk/gradle.properties</code> to say <code>ANDROID_BUILD_TOOLS_VERSION=19.1.0</code>
-5. Place the following in `res/values/strings.xml` of each sample project:
-  * Parse application id and client key
-  * Facebook application id
-  * Twitter consumer key and consumer secret
-6. Build and run the sample project using Android Studio or Eclipse.
+2. Import this repository's projects with Android Studio. The project has Maven dependencies on the Facebook SDK and the Bolts framework.  Android Studio automatically resolves these.
+3. Specify the following in `res/values/strings.xml` of each sample project:
+  * <code>parse_app_id</code> and <code>parse_client_key</code>
+  * <code>facebook_app_id</code>
+  * <code>twitter_consumer_key</code> and <code>twitter_consumer_secret<code>
+4. Build and run the sample project using Android Studio.
 
 ## Documentation
 For complete details about this library project, please see our [documentation](http://www.parse.com/docs/android_guide#ui-login) on the Parse website.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,7 @@
-repositories {
-    mavenCentral()
+allprojects {
+    repositories {
+        mavenCentral()
+    }
 }
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
@@ -8,14 +10,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.11.+'
+        classpath 'com.android.tools.build:gradle:0.12.+'
     }
 }
 
 ext {
-    compileSdkVersion = 19
-    buildToolsVersion = "19.1.0"
+    compileSdkVersion = 21
+    buildToolsVersion = "21.1.1"
 
-    minSdkVersion = 8
+    minSdkVersion = 9
     targetSdkVersion = 19
 }
diff --git a/facebook-sdk b/facebook-sdk
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 18 17:45:21 PDT 2014
+#Mon Nov 17 20:23:27 PST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.10-all.zip

Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-[submodule "facebook-sdk"]`
`2`		`- path = facebook-sdk`
`3`		`- url = git@github.com:facebook/facebook-android-sdk.git`