diff --git a/ParseLoginSampleBasic/build.gradle b/ParseLoginSampleBasic/build.gradle index e123aac..5ced383 100644 --- a/ParseLoginSampleBasic/build.gradle +++ b/ParseLoginSampleBasic/build.gradle @@ -1,9 +1,11 @@ apply plugin: 'android' dependencies { - compile 'com.facebook.android:facebook-android-sdk:3.21.1' + compile 'com.facebook.android:facebook-android-sdk:3.23.1' compile project(':ParseLoginUI') - compile 'com.android.support:support-v4:21.0.0' + compile 'com.android.support:support-v4:22.0.0' + compile files('../ParseLoginUI/libs/Parse-1.8.4.jar') + compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar') } android { diff --git a/ParseLoginSampleCodeCustomization/build.gradle b/ParseLoginSampleCodeCustomization/build.gradle index e123aac..5ced383 100644 --- a/ParseLoginSampleCodeCustomization/build.gradle +++ b/ParseLoginSampleCodeCustomization/build.gradle @@ -1,9 +1,11 @@ apply plugin: 'android' dependencies { - compile 'com.facebook.android:facebook-android-sdk:3.21.1' + compile 'com.facebook.android:facebook-android-sdk:3.23.1' compile project(':ParseLoginUI') - compile 'com.android.support:support-v4:21.0.0' + compile 'com.android.support:support-v4:22.0.0' + compile files('../ParseLoginUI/libs/Parse-1.8.4.jar') + compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar') } android { diff --git a/ParseLoginSampleLayoutOverride/build.gradle b/ParseLoginSampleLayoutOverride/build.gradle index e123aac..5ced383 100644 --- a/ParseLoginSampleLayoutOverride/build.gradle +++ b/ParseLoginSampleLayoutOverride/build.gradle @@ -1,9 +1,11 @@ apply plugin: 'android' dependencies { - compile 'com.facebook.android:facebook-android-sdk:3.21.1' + compile 'com.facebook.android:facebook-android-sdk:3.23.1' compile project(':ParseLoginUI') - compile 'com.android.support:support-v4:21.0.0' + compile 'com.android.support:support-v4:22.0.0' + compile files('../ParseLoginUI/libs/Parse-1.8.4.jar') + compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar') } android { diff --git a/ParseLoginSampleWithDispatchActivity/build.gradle b/ParseLoginSampleWithDispatchActivity/build.gradle index e123aac..5ced383 100644 --- a/ParseLoginSampleWithDispatchActivity/build.gradle +++ b/ParseLoginSampleWithDispatchActivity/build.gradle @@ -1,9 +1,11 @@ apply plugin: 'android' dependencies { - compile 'com.facebook.android:facebook-android-sdk:3.21.1' + compile 'com.facebook.android:facebook-android-sdk:3.23.1' compile project(':ParseLoginUI') - compile 'com.android.support:support-v4:21.0.0' + compile 'com.android.support:support-v4:22.0.0' + compile files('../ParseLoginUI/libs/Parse-1.8.4.jar') + compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar') } android { diff --git a/ParseLoginUI/build.gradle b/ParseLoginUI/build.gradle index fea9711..85d2f27 100644 --- a/ParseLoginUI/build.gradle +++ b/ParseLoginUI/build.gradle @@ -2,10 +2,20 @@ apply plugin: 'android-library' dependencies { compile 'com.parse.bolts:bolts-android:1.1.4' - compile 'com.android.support:support-v4:21.0.0' - compile fileTree(dir: 'libs', include: '*.jar') + compile 'com.android.support:support-v4:22.0.0' - provided 'com.facebook.android:facebook-android-sdk:3.21.1' + provided 'com.facebook.android:facebook-android-sdk:3.23.1' + + // This assumes that your app's project has a compile dependency on the Parse SDK JAR files. + // Your project's build.gradle should say: + // + // compile files('YOUR_PROJECT_LIBS_PATH/Parse-1.8.4.jar') + // compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtils-1.8.4.jar') + // + // Since the dependency below is "provided" instead of "compile", your project's build.gradle + // does not have to refer to the same Parse SDK instance that's in the ParseLoginUI/libs folder. + provided files('libs/Parse-1.8.4.jar') + provided files('libs/ParseFacebookUtils-1.8.4.jar') } android { diff --git a/ParseLoginUI/libs/Parse-1.8.0.jar b/ParseLoginUI/libs/Parse-1.8.0.jar deleted file mode 100644 index f54239c..0000000 Binary files a/ParseLoginUI/libs/Parse-1.8.0.jar and /dev/null differ diff --git a/ParseLoginUI/libs/Parse-1.8.4.jar b/ParseLoginUI/libs/Parse-1.8.4.jar new file mode 100644 index 0000000..a125e83 Binary files /dev/null and b/ParseLoginUI/libs/Parse-1.8.4.jar differ diff --git a/ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar b/ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar new file mode 100644 index 0000000..47ba799 Binary files /dev/null and b/ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar differ diff --git a/README.md b/README.md index 0177a1e..c1c04a0 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ We built several sample apps demonstrating how to use the `ParseLoginUI` library this library into your app, we recommend that you run these sample apps to become familiar with its functionality and customizations. In this section, we describe Android Studio instructions for running the sample apps (as a standalone project), and importing the `ParseLoginUI` library into -your own app. These instructions were last tested on Android Studio 1.0.2. +your own app. These instructions were last tested on Android Studio 1.1.0. #### Running Sample Projects To run our sample apps, you need to import this repo as a standalone Gradle project: @@ -29,13 +29,18 @@ To run our sample apps, you need to import this repo as a standalone Gradle proj 2. Import `ParseLoginUI` as a module into your app's Android Studio Project * File > Import Module in Android Studio * In the New Module pop-up, set the source directory to the `ParseUI-Android/ParseLoginUI` folder within the cloned repo. -3. Add the following to the `dependencies` section of app's build.gradle. This adds a module dependency to `ParseLoginUI` (and optional Maven dependency for Facebook SDK). +3. Add the following to the `dependencies` section of your app's build.gradle. + // Module dependency on ParseLoginUI library sources compile project(':ParseLoginUI') - // Uncomment if using Facebook Login - // compile 'com.facebook.android:facebook-android-sdk:3.21.1' + // If your app's project does not have the Parse Android SDK already, copy it into your + // project at YOUR_PROJECT_LIBS_PATH. + compile files('YOUR_PROJECT_LIBS_PATH/Parse-1.8.4.jar') + compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtils-1.8.4.jar') + // Uncomment if using Facebook Login (optional Maven dependency) + // compile 'com.facebook.android:facebook-android-sdk:3.23.1' 4. Add the following to your `AndroidManifest.xml` within the `` section. You can see a complete example in our [sample app](https://github.com/ParsePlatform/ParseUI-Android/blob/master/ParseLoginSampleBasic/AndroidManifest.xml).