Skip to content

Commit 2479094

Browse files
committed
Move Parse SDK file out of ParseLoginUI library, upgrade to latest Parse SDK
1 parent 3b2e94f commit 2479094

File tree

8 files changed

+22
-4
lines changed

8 files changed

+22
-4
lines changed

ParseLoginSampleBasic/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dependencies {
44
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
55
compile project(':ParseLoginUI')
66
compile 'com.android.support:support-v4:21.0.0'
7+
compile files(':libs/Parse-1.8.2.jar')
78
}
89

910
android {

ParseLoginSampleCodeCustomization/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dependencies {
44
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
55
compile project(':ParseLoginUI')
66
compile 'com.android.support:support-v4:21.0.0'
7+
compile files(':libs/Parse-1.8.2.jar')
78
}
89

910
android {

ParseLoginSampleLayoutOverride/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dependencies {
44
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
55
compile project(':ParseLoginUI')
66
compile 'com.android.support:support-v4:21.0.0'
7+
compile files(':libs/Parse-1.8.2.jar')
78
}
89

910
android {

ParseLoginSampleWithDispatchActivity/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dependencies {
44
compile 'com.facebook.android:facebook-android-sdk:3.21.1'
55
compile project(':ParseLoginUI')
66
compile 'com.android.support:support-v4:21.0.0'
7+
compile files(':libs/Parse-1.8.2.jar')
78
}
89

910
android {

ParseLoginUI/build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,18 @@ apply plugin: 'android-library'
33
dependencies {
44
compile 'com.parse.bolts:bolts-android:1.1.4'
55
compile 'com.android.support:support-v4:21.0.0'
6-
compile fileTree(dir: 'libs', include: '*.jar')
76

87
provided 'com.facebook.android:facebook-android-sdk:3.21.1'
8+
9+
// This assumes that
10+
// 1. The Parse SDK file is in <PROJECT_ROOT>/libs folder.
11+
// 2. Your app's project has a compile dependency on the Parse SDK JAR file.
12+
// Your project's build.gradle should say:
13+
//
14+
// compile files(':libs/Parse-1.8.2.jar')
15+
//
16+
// See ParseLoginSampleBasic/build.gradle for an example.
17+
provided files(':libs/Parse-1.8.2.jar')
918
}
1019

1120
android {

ParseLoginUI/libs/Parse-1.8.0.jar

-813 KB
Binary file not shown.

README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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 <PROJECT_ROOT>/libs. The Parse SDK path must match the "provided files(...)"
39+
// line in ParseLoginUI/build.gradle.
40+
compile files(':libs/Parse-1.8.2.jar')
3841

42+
// Uncomment if using Facebook Login (optional Maven dependency)
43+
// compile 'com.facebook.android:facebook-android-sdk:3.21.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

libs/Parse-1.8.2.jar

819 KB
Binary file not shown.

0 commit comments

Comments
 (0)