Skip to content

Commit 353fca2

Browse files
committed
Merge pull request #30 from ParsePlatform/improve_gradle_configs
Change ParseLoginUI's Parse SDK dependency to provided, update Parse SDK
2 parents 3b2e94f + 7f38a16 commit 353fca2

File tree

9 files changed

+38
-15
lines changed

9 files changed

+38
-15
lines changed

ParseLoginSampleBasic/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
apply plugin: 'android'
22

33
dependencies {
4-
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
4+
compile 'com.facebook.android:facebook-android-sdk:3.23.1'
55
compile project(':ParseLoginUI')
6-
compile 'com.android.support:support-v4:21.0.0'
6+
compile 'com.android.support:support-v4:22.0.0'
7+
compile files('../ParseLoginUI/libs/Parse-1.8.4.jar')
8+
compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar')
79
}
810

911
android {

ParseLoginSampleCodeCustomization/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
apply plugin: 'android'
22

33
dependencies {
4-
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
4+
compile 'com.facebook.android:facebook-android-sdk:3.23.1'
55
compile project(':ParseLoginUI')
6-
compile 'com.android.support:support-v4:21.0.0'
6+
compile 'com.android.support:support-v4:22.0.0'
7+
compile files('../ParseLoginUI/libs/Parse-1.8.4.jar')
8+
compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar')
79
}
810

911
android {

ParseLoginSampleLayoutOverride/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
apply plugin: 'android'
22

33
dependencies {
4-
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
4+
compile 'com.facebook.android:facebook-android-sdk:3.23.1'
55
compile project(':ParseLoginUI')
6-
compile 'com.android.support:support-v4:21.0.0'
6+
compile 'com.android.support:support-v4:22.0.0'
7+
compile files('../ParseLoginUI/libs/Parse-1.8.4.jar')
8+
compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar')
79
}
810

911
android {

ParseLoginSampleWithDispatchActivity/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
apply plugin: 'android'
22

33
dependencies {
4-
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
4+
compile 'com.facebook.android:facebook-android-sdk:3.23.1'
55
compile project(':ParseLoginUI')
6-
compile 'com.android.support:support-v4:21.0.0'
6+
compile 'com.android.support:support-v4:22.0.0'
7+
compile files('../ParseLoginUI/libs/Parse-1.8.4.jar')
8+
compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar')
79
}
810

911
android {

ParseLoginUI/build.gradle

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@ apply plugin: 'android-library'
22

33
dependencies {
44
compile 'com.parse.bolts:bolts-android:1.1.4'
5-
compile 'com.android.support:support-v4:21.0.0'
6-
compile fileTree(dir: 'libs', include: '*.jar')
5+
compile 'com.android.support:support-v4:22.0.0'
76

8-
provided 'com.facebook.android:facebook-android-sdk:3.21.1'
7+
provided 'com.facebook.android:facebook-android-sdk:3.23.1'
8+
9+
// This assumes that your app's project has a compile dependency on the Parse SDK JAR files.
10+
// Your project's build.gradle should say:
11+
//
12+
// compile files('YOUR_PROJECT_LIBS_PATH/Parse-1.8.4.jar')
13+
// compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtils-1.8.4.jar')
14+
//
15+
// Since the dependency below is "provided" instead of "compile", your project's build.gradle
16+
// does not have to refer to the same Parse SDK instance that's in the ParseLoginUI/libs folder.
17+
provided files('libs/Parse-1.8.4.jar')
18+
provided files('libs/ParseFacebookUtils-1.8.4.jar')
919
}
1020

1121
android {

ParseLoginUI/libs/Parse-1.8.0.jar

-813 KB
Binary file not shown.

ParseLoginUI/libs/Parse-1.8.4.jar

835 KB
Binary file not shown.
16.6 KB
Binary file not shown.

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We built several sample apps demonstrating how to use the `ParseLoginUI` library
1111
this library into your app, we recommend that you run these sample apps to become familiar with its
1212
functionality and customizations. In this section, we describe Android Studio instructions for
1313
running the sample apps (as a standalone project), and importing the `ParseLoginUI` library into
14-
your own app. These instructions were last tested on Android Studio 1.0.2.
14+
your own app. These instructions were last tested on Android Studio 1.1.0.
1515

1616
#### Running Sample Projects
1717
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
2929
2. Import `ParseLoginUI` as a module into your app's Android Studio Project
3030
* File > Import Module in Android Studio
3131
* In the New Module pop-up, set the source directory to the `ParseUI-Android/ParseLoginUI` folder within the cloned repo.
32-
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).
32+
3. Add the following to the `dependencies` section of your app's build.gradle.
3333

34+
// Module dependency on ParseLoginUI library sources
3435
compile project(':ParseLoginUI')
3536

36-
// Uncomment if using Facebook Login
37-
// compile 'com.facebook.android:facebook-android-sdk:3.21.1'
37+
// If your app's project does not have the Parse Android SDK already, copy it into your
38+
// project at YOUR_PROJECT_LIBS_PATH.
39+
compile files('YOUR_PROJECT_LIBS_PATH/Parse-1.8.4.jar')
40+
compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtils-1.8.4.jar')
3841

42+
// Uncomment if using Facebook Login (optional Maven dependency)
43+
// compile 'com.facebook.android:facebook-android-sdk:3.23.1'
3944

4045
4. Add the following to your `AndroidManifest.xml` within the `<application></application>` section. You can see a complete example in our [sample app](https://github.com/ParsePlatform/ParseUI-Android/blob/master/ParseLoginSampleBasic/AndroidManifest.xml).
4146

0 commit comments

Comments
 (0)