diff --git a/ParseLoginSampleBasic/build.gradle b/ParseLoginSampleBasic/build.gradle index 99f54f4..c6ddb33 100644 --- a/ParseLoginSampleBasic/build.gradle +++ b/ParseLoginSampleBasic/build.gradle @@ -5,7 +5,7 @@ dependencies { compile rootProject.ext.facebookSDK compile project(':ParseLoginUI') compile rootProject.ext.androidSupport - compile files(rootProject.ext.parsePath) + compile rootProject.ext.parse compile files(rootProject.ext.parseFacebookUtilsPath) compile files(rootProject.ext.parseTwitterUtilsPath) } diff --git a/ParseLoginSampleCodeCustomization/build.gradle b/ParseLoginSampleCodeCustomization/build.gradle index 99f54f4..c6ddb33 100644 --- a/ParseLoginSampleCodeCustomization/build.gradle +++ b/ParseLoginSampleCodeCustomization/build.gradle @@ -5,7 +5,7 @@ dependencies { compile rootProject.ext.facebookSDK compile project(':ParseLoginUI') compile rootProject.ext.androidSupport - compile files(rootProject.ext.parsePath) + compile rootProject.ext.parse compile files(rootProject.ext.parseFacebookUtilsPath) compile files(rootProject.ext.parseTwitterUtilsPath) } diff --git a/ParseLoginSampleLayoutOverride/build.gradle b/ParseLoginSampleLayoutOverride/build.gradle index 99f54f4..c6ddb33 100644 --- a/ParseLoginSampleLayoutOverride/build.gradle +++ b/ParseLoginSampleLayoutOverride/build.gradle @@ -5,7 +5,7 @@ dependencies { compile rootProject.ext.facebookSDK compile project(':ParseLoginUI') compile rootProject.ext.androidSupport - compile files(rootProject.ext.parsePath) + compile rootProject.ext.parse compile files(rootProject.ext.parseFacebookUtilsPath) compile files(rootProject.ext.parseTwitterUtilsPath) } diff --git a/ParseLoginSampleWithDispatchActivity/build.gradle b/ParseLoginSampleWithDispatchActivity/build.gradle index 99f54f4..c6ddb33 100644 --- a/ParseLoginSampleWithDispatchActivity/build.gradle +++ b/ParseLoginSampleWithDispatchActivity/build.gradle @@ -5,7 +5,7 @@ dependencies { compile rootProject.ext.facebookSDK compile project(':ParseLoginUI') compile rootProject.ext.androidSupport - compile files(rootProject.ext.parsePath) + compile rootProject.ext.parse compile files(rootProject.ext.parseFacebookUtilsPath) compile files(rootProject.ext.parseTwitterUtilsPath) } diff --git a/ParseLoginUI/build.gradle b/ParseLoginUI/build.gradle index b63f108..3be03f0 100644 --- a/ParseLoginUI/build.gradle +++ b/ParseLoginUI/build.gradle @@ -1,19 +1,11 @@ apply plugin: 'android-library' dependencies { - compile 'com.parse.bolts:bolts-android:1.2.0' - compile 'com.android.support:support-v4:22.0.0' + compile rootProject.ext.bolts + compile rootProject.ext.androidSupport + compile rootProject.ext.parse - provided 'com.facebook.android:facebook-android-sdk:4.0.1' - // This assumes that your app's project has a compile dependency on the Parse SDK JAR files. - // Your project's build.gradle should say: - // - // compile files('YOUR_PROJECT_LIBS_PATH/Parse-1.9.4.jar') - // compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtilsV4-1.9.4.jar') - // - // Since the dependency below is "provided" instead of "compile", your project's build.gradle - // does not have to refer to the same Parse SDK instance that's in the ParseLoginUI/libs folder. - provided files("$rootProject.projectDir/ParseLoginUI/libs/Parse-1.10.0.jar") + provided rootProject.ext.facebookSDK provided files("$rootProject.projectDir/ParseLoginUI/libs/ParseFacebookUtilsV4-1.10.0.jar") provided files("$rootProject.projectDir/ParseLoginUI/libs/ParseTwitterUtils-1.10.0.jar") } diff --git a/ParseLoginUI/libs/Parse-1.10.0.jar b/ParseLoginUI/libs/Parse-1.10.0.jar deleted file mode 100644 index 08b0d7b..0000000 Binary files a/ParseLoginUI/libs/Parse-1.10.0.jar and /dev/null differ diff --git a/README.md b/README.md index 7fae072..06f656c 100644 --- a/README.md +++ b/README.md @@ -31,19 +31,14 @@ To run our sample apps, you need to import this repo as a standalone Gradle proj * File > Import Module in Android Studio * In the New Module pop-up, set the source directory to the `ParseUI-Android/ParseLoginUI` folder within the cloned repo. - If you are using gradle 1.1.0 or above, you may encounter "Warning:Project ParseLoginUI: provided dependencies can only be jars. com.facebook.android:facebook-android-sdk:aar:4.0.1 is an Android Library". It is an open issue of android gradle build tool. Currently the workround is using gradle 1.0.0. 4. Add the following to the `dependencies` section of your app's build.gradle. // Module dependency on ParseLoginUI library sources compile project(':ParseLoginUI') - // If your app's project does not have the Parse Android SDK already, copy it into your - // project at YOUR_PROJECT_LIBS_PATH. - compile files('YOUR_PROJECT_LIBS_PATH/Parse-1.9.4.jar') - compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtilsV4-1.9.4.jar') - // 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') 5. Add the following to your `AndroidManifest.xml` within the `` section. You can see a complete example in our [sample app](https://github.com/ParsePlatform/ParseUI-Android/blob/master/ParseLoginSampleBasic/AndroidManifest.xml). diff --git a/build.gradle b/build.gradle index 98c0aff..d3daf07 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext { facebookSDK = 'com.facebook.android:facebook-android-sdk:4.0.1' androidSupport = 'com.android.support:support-v4:22.0.0' bolts = 'com.parse.bolts:bolts-android:1.2.0' - parsePath = "$rootProject.projectDir/ParseLoginUI/libs/Parse-1.10.0.jar" + parse = 'com.parse:parse-android:1.10.0' parseFacebookUtilsPath = "$rootProject.projectDir/ParseLoginUI/libs/ParseFacebookUtilsV4-1.10.0.jar" parseTwitterUtilsPath = "$rootProject.projectDir/ParseLoginUI/libs/ParseTwitterUtils-1.10.0.jar" }