Skip to content

Update Libraries #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2015
Merged

Update Libraries #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32b725d
Update Libraries
wangmengyan95 Oct 8, 2015
66f241f
Downgrade the ParseUI-Login fb sdk to 4.4.0
wangmengyan95 Oct 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ParseLoginSampleBasic/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ dependencies {
compile project(':ParseUI-Login')
compile rootProject.ext.androidSupport
compile rootProject.ext.parse
compile files(rootProject.ext.parseFacebookUtilsPath)
compile files(rootProject.ext.parseTwitterUtilsPath)
compile rootProject.ext.parseFacebookUtils
compile rootProject.ext.parseTwitterUtils
}

android {
Expand Down
4 changes: 2 additions & 2 deletions ParseLoginSampleCodeCustomization/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ dependencies {
compile project(':ParseUI-Login')
compile rootProject.ext.androidSupport
compile rootProject.ext.parse
compile files(rootProject.ext.parseFacebookUtilsPath)
compile files(rootProject.ext.parseTwitterUtilsPath)
compile rootProject.ext.parseFacebookUtils
compile rootProject.ext.parseTwitterUtils
}

android {
Expand Down
4 changes: 2 additions & 2 deletions ParseLoginSampleLayoutOverride/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ dependencies {
compile project(':ParseUI-Login')
compile rootProject.ext.androidSupport
compile rootProject.ext.parse
compile files(rootProject.ext.parseFacebookUtilsPath)
compile files(rootProject.ext.parseTwitterUtilsPath)
compile rootProject.ext.parseFacebookUtils
compile rootProject.ext.parseTwitterUtils
}

android {
Expand Down
4 changes: 2 additions & 2 deletions ParseLoginSampleWithDispatchActivity/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ dependencies {
compile project(':ParseUI-Login')
compile rootProject.ext.androidSupport
compile rootProject.ext.parse
compile files(rootProject.ext.parseFacebookUtilsPath)
compile files(rootProject.ext.parseTwitterUtilsPath)
compile rootProject.ext.parseFacebookUtils
compile rootProject.ext.parseTwitterUtils
}

android {
Expand Down
10 changes: 5 additions & 5 deletions ParseUI-Login/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
apply plugin: 'android-library'

dependencies {
compile 'com.android.support:support-v4:22.0.0'
compile 'com.parse:parse-android:1.10.1'
compile 'com.android.support:support-v4:23.0.1'
compile 'com.parse:parse-android:1.10.3'

provided 'com.facebook.android:facebook-android-sdk:4.0.1'
provided files("$rootProject.projectDir/ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar")
provided files("$rootProject.projectDir/ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar")
provided 'com.facebook.android:facebook-android-sdk:4.4.0'
provided 'com.parse:parsefacebookutils-v4-android:1.10.3@aar'
provided 'com.parse:parsetwitterutils-android:1.10.3'
}

android {
Expand Down
Binary file removed ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ParseUI-Widget/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
apply plugin: 'com.android.library'

dependencies {
compile 'com.parse:parse-android:1.10.1'
compile 'com.parse:parse-android:1.10.3'

androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ The `ParseUI-Widget` library provides several useful UI widgets which integrate
compile project(':ParseUI-Widget')

// Uncomment if using Facebook Login (optional Maven dependency)
// compile 'com.facebook.android:facebook-android-sdk:4.0.1'
// compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtilsV4-1.10.0.jar')
// compile 'com.facebook.android:facebook-android-sdk:4.6.0'
// compile 'com.parse:parsefacebookutils-v4-android:1.10.3@aar'
```

## Usage
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ ext {
compileSdkVersion = 21
buildToolsVersion = "21.1.1"

minSdkVersion = 9
minSdkVersion = 15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the reason for this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FB SDK requires this.
Actually it is a requirement for 4.6.0, if we use 4.4.0 then it is fine to keep it 9.
What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this variable only used for the samples? It looks like ParseUI-Login and ParseUI-Widget still have minSdkVersion = 9. If this is the case, I think it's fine.

targetSdkVersion = 21

facebookSDK = 'com.facebook.android:facebook-android-sdk:4.0.1'
androidSupport = 'com.android.support:support-v4:22.0.0'
facebookSDK = 'com.facebook.android:facebook-android-sdk:4.6.0'
androidSupport = 'com.android.support:support-v4:23.0.1'
bolts = 'com.parse.bolts:bolts-android:1.2.1'
parse = 'com.parse:parse-android:1.10.1'
parseFacebookUtilsPath = "$rootProject.projectDir/ParseUI-Login/libs/ParseFacebookUtilsV4-1.10.1.jar"
parseTwitterUtilsPath = "$rootProject.projectDir/ParseUI-Login/libs/ParseTwitterUtils-1.10.1.jar"
parse = 'com.parse:parse-android:1.10.3'
parseFacebookUtils = 'com.parse:parsefacebookutils-v4-android:1.10.3@aar'
parseTwitterUtils = 'com.parse:parsetwitterutils-android:1.10.3'
}