Skip to content

Commit f0f15c9

Browse files
committed
Update SDKs to latest, use Maven instead of git submodule, README instructions focus on Android Studio
1 parent 727fa07 commit f0f15c9

File tree

12 files changed

+22
-41
lines changed

12 files changed

+22
-41
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "facebook-sdk"]
2-
path = facebook-sdk
3-
url = git@github.com:facebook/facebook-android-sdk.git

ParseLoginSampleBasic/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ apply plugin: 'android'
22

33
dependencies {
44
compile project(':ParseLoginUI')
5-
compile project(':facebook-sdk:facebook')
6-
compile 'com.android.support:support-v4:13.0.+'
7-
compile fileTree(dir: 'libs', include: '*.jar')
5+
compile 'com.android.support:support-v4:21.0.0'
86
}
97

108
android {

ParseLoginSampleCodeCustomization/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ apply plugin: 'android'
22

33
dependencies {
44
compile project(':ParseLoginUI')
5-
compile project(':facebook-sdk:facebook')
6-
compile 'com.android.support:support-v4:13.0.+'
7-
compile fileTree(dir: 'libs', include: '*.jar')
5+
compile 'com.android.support:support-v4:21.0.0'
86
}
97

108
android {

ParseLoginSampleLayoutOverride/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ apply plugin: 'android'
22

33
dependencies {
44
compile project(':ParseLoginUI')
5-
compile project(':facebook-sdk:facebook')
6-
compile 'com.android.support:support-v4:13.0.+'
7-
compile fileTree(dir: 'libs', include: '*.jar')
5+
compile 'com.android.support:support-v4:21.0.0'
86
}
97

108
android {

ParseLoginSampleWithDispatchActivity/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ apply plugin: 'android'
22

33
dependencies {
44
compile project(':ParseLoginUI')
5-
compile project(':facebook-sdk:facebook')
6-
compile 'com.android.support:support-v4:13.0.+'
7-
compile fileTree(dir: 'libs', include: '*.jar')
5+
compile 'com.android.support:support-v4:21.0.0'
86
}
97

108
android {

ParseLoginUI/build.gradle

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

33
dependencies {
4-
compile project(':facebook-sdk:facebook')
5-
compile 'com.android.support:support-v4:13.0.+'
4+
compile 'com.facebook.android:facebook-android-sdk:3.20.0'
5+
compile 'com.parse.bolts:bolts-android:1.1.3'
6+
compile 'com.android.support:support-v4:21.0.0'
67
compile fileTree(dir: 'libs', include: '*.jar')
78
}
89

ParseLoginUI/libs/Parse-1.7.0.jar

-831 KB
Binary file not shown.

ParseLoginUI/libs/Parse-1.7.1.jar

812 KB
Binary file not shown.

README.md

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,21 @@
22
## Overview
33
This project contains the `ParseLoginUI` library for building login and signup flows with the Parse Android SDK.
44
You can easily configure the look and feel of the login screens by either specifying XML configurations or constructing an Intent in code.
5-
To use this project with your app, you should import it as a library project in Android Studio or Eclipse.
5+
To use this project with your app, you should import it as a library project in Android Studio.
66

77
![sample screens](http://parseui-android.parseapp.com/images/parse_login_sample_screens.png)
88

99
We also provide several sample projects demonstrating how to use the `ParseLoginUI` library. To run these
1010
sample projects, you need to do the following:
1111

1212
1. Clone this repository onto your machine.
13-
2. Fetch the Facebook SDK Git submodule by running the following command in your local ParseUI-Android repository directory: `git submodule update --init --recursive`
14-
3. Import this repository's projects with Android Studio or Eclipse.
15-
1. For Android Studio, just import your local ParseUI-Android repository directory.
16-
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").
17-
* `ParseLoginUI`
18-
* `ParseLoginSampleBasic`
19-
* `ParseLoginSampleCodeCustomization`
20-
* `ParseLoginSampleLayoutOverride`
21-
* `ParseLoginSampleWithDispatchActivity`
22-
* `facebook-sdk/facebook`
23-
![eclipse import](http://parseui-android.parseapp.com/images/eclipse_import_after_edit.png)
24-
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>
25-
5. Place the following in `res/values/strings.xml` of each sample project:
13+
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.
14+
3. Make sure you have Android Build Tools 21.1.1 installed through Android SDK Manager.
15+
4. Place the following in `res/values/strings.xml` of each sample project:
2616
* Parse application id and client key
2717
* Facebook application id
2818
* Twitter consumer key and consumer secret
29-
6. Build and run the sample project using Android Studio or Eclipse.
19+
5. Build and run the sample project using Android Studio.
3020

3121
## Documentation
3222
For complete details about this library project, please see our [documentation](http://www.parse.com/docs/android_guide#ui-login) on the Parse website.

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
repositories {
2-
mavenCentral()
1+
allprojects {
2+
repositories {
3+
mavenCentral()
4+
}
35
}
46

57
// Top-level build file where you can add configuration options common to all sub-projects/modules.
@@ -8,14 +10,14 @@ buildscript {
810
mavenCentral()
911
}
1012
dependencies {
11-
classpath 'com.android.tools.build:gradle:0.11.+'
13+
classpath 'com.android.tools.build:gradle:0.12.+'
1214
}
1315
}
1416

1517
ext {
16-
compileSdkVersion = 19
17-
buildToolsVersion = "19.1.0"
18+
compileSdkVersion = 21
19+
buildToolsVersion = "21.1.1"
1820

19-
minSdkVersion = 8
21+
minSdkVersion = 9
2022
targetSdkVersion = 19
2123
}

0 commit comments

Comments
 (0)