Skip to content

Commit d001c3d

Browse files
committed
Merge pull request #65 from ParsePlatform/wangmengyan.reorgainze_package
Reorgainze ParseUI
2 parents ec6256f + 73f3d26 commit d001c3d

File tree

59 files changed

+197
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+197
-167
lines changed

ParseLoginSampleBasic/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'android'
33
dependencies {
44
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
55
compile rootProject.ext.facebookSDK
6-
compile project(':ParseLoginUI')
6+
compile project(':ParseUI-Login')
77
compile rootProject.ext.androidSupport
88
compile rootProject.ext.parse
99
compile files(rootProject.ext.parseFacebookUtilsPath)

ParseLoginSampleCodeCustomization/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'android'
33
dependencies {
44
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
55
compile rootProject.ext.facebookSDK
6-
compile project(':ParseLoginUI')
6+
compile project(':ParseUI-Login')
77
compile rootProject.ext.androidSupport
88
compile rootProject.ext.parse
99
compile files(rootProject.ext.parseFacebookUtilsPath)

ParseLoginSampleLayoutOverride/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'android'
33
dependencies {
44
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
55
compile rootProject.ext.facebookSDK
6-
compile project(':ParseLoginUI')
6+
compile project(':ParseUI-Login')
77
compile rootProject.ext.androidSupport
88
compile rootProject.ext.parse
99
compile files(rootProject.ext.parseFacebookUtilsPath)

ParseLoginSampleWithDispatchActivity/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'android'
33
dependencies {
44
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
55
compile rootProject.ext.facebookSDK
6-
compile project(':ParseLoginUI')
6+
compile project(':ParseUI-Login')
77
compile rootProject.ext.androidSupport
88
compile rootProject.ext.parse
99
compile files(rootProject.ext.parseFacebookUtilsPath)

ParseLoginUI/build.gradle

Lines changed: 0 additions & 26 deletions
This file was deleted.

ParseLoginUI/src/androidTest/AndroidManifest.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

ParseLoginUI/src/main/AndroidManifest.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

ParseUI-Login/build.gradle

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright (c) 2014, Parse, LLC. All rights reserved.
3+
*
4+
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
5+
* copy, modify, and distribute this software in source code or binary form for use
6+
* in connection with the web services and APIs provided by Parse.
7+
*
8+
* As with any software that integrates with the Parse platform, your use of
9+
* this software is subject to the Parse Terms of Service
10+
* [https://www.parse.com/about/terms]. This copyright notice shall be
11+
* included in all copies or substantial portions of the software.
12+
*
13+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
15+
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
16+
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
17+
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
18+
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
19+
*
20+
*/
21+
22+
apply plugin: 'android-library'
23+
24+
dependencies {
25+
compile 'com.android.support:support-v4:22.0.0'
26+
compile 'com.parse:parse-android:1.10.1'
27+
28+
provided 'com.facebook.android:facebook-android-sdk:4.0.1'
29+
provided files("$rootProject.projectDir/ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar")
30+
provided files("$rootProject.projectDir/ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar")
31+
}
32+
33+
android {
34+
compileSdkVersion 21
35+
buildToolsVersion "21.1.1"
36+
37+
defaultConfig {
38+
minSdkVersion 9
39+
targetSdkVersion 21
40+
}
41+
}

0 commit comments

Comments
 (0)