diff --git a/.travis.yml b/.travis.yml index 4f319c4..78121ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ branches: language: android jdk: - - oraclejdk8 + - openjdk8 before_install: - mkdir "$ANDROID_HOME/licenses" || true diff --git a/ParseLoginSampleBasic/build.gradle b/ParseLoginSampleBasic/build.gradle index dcfe4d3..c565363 100644 --- a/ParseLoginSampleBasic/build.gradle +++ b/ParseLoginSampleBasic/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application' +apply plugin: "com.android.application" android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -14,8 +14,8 @@ android { dependencies { // rootProject.ext.* variables are defined in project gradle file, you can also use path here. - implementation project(':login') - implementation "androidx.appcompat:appcompat:1.0.2" + implementation project(":login") + implementation rootProject.ext.appcompat implementation rootProject.ext.parse implementation rootProject.ext.parseFacebookUtils implementation rootProject.ext.parseTwitterUtils diff --git a/ParseLoginSampleCodeCustomization/build.gradle b/ParseLoginSampleCodeCustomization/build.gradle index dcfe4d3..c565363 100644 --- a/ParseLoginSampleCodeCustomization/build.gradle +++ b/ParseLoginSampleCodeCustomization/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application' +apply plugin: "com.android.application" android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -14,8 +14,8 @@ android { dependencies { // rootProject.ext.* variables are defined in project gradle file, you can also use path here. - implementation project(':login') - implementation "androidx.appcompat:appcompat:1.0.2" + implementation project(":login") + implementation rootProject.ext.appcompat implementation rootProject.ext.parse implementation rootProject.ext.parseFacebookUtils implementation rootProject.ext.parseTwitterUtils diff --git a/ParseLoginSampleLayoutOverride/build.gradle b/ParseLoginSampleLayoutOverride/build.gradle index dcfe4d3..c565363 100644 --- a/ParseLoginSampleLayoutOverride/build.gradle +++ b/ParseLoginSampleLayoutOverride/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application' +apply plugin: "com.android.application" android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -14,8 +14,8 @@ android { dependencies { // rootProject.ext.* variables are defined in project gradle file, you can also use path here. - implementation project(':login') - implementation "androidx.appcompat:appcompat:1.0.2" + implementation project(":login") + implementation rootProject.ext.appcompat implementation rootProject.ext.parse implementation rootProject.ext.parseFacebookUtils implementation rootProject.ext.parseTwitterUtils diff --git a/ParseLoginSampleWithDispatchActivity/build.gradle b/ParseLoginSampleWithDispatchActivity/build.gradle index dcfe4d3..c565363 100644 --- a/ParseLoginSampleWithDispatchActivity/build.gradle +++ b/ParseLoginSampleWithDispatchActivity/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application' +apply plugin: "com.android.application" android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -14,8 +14,8 @@ android { dependencies { // rootProject.ext.* variables are defined in project gradle file, you can also use path here. - implementation project(':login') - implementation "androidx.appcompat:appcompat:1.0.2" + implementation project(":login") + implementation rootProject.ext.appcompat implementation rootProject.ext.parse implementation rootProject.ext.parseFacebookUtils implementation rootProject.ext.parseTwitterUtils diff --git a/ParseUI-Widget-Sample/build.gradle b/ParseUI-Widget-Sample/build.gradle index 0601cf1..70cde64 100644 --- a/ParseUI-Widget-Sample/build.gradle +++ b/ParseUI-Widget-Sample/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application' +apply plugin: "com.android.application" android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -16,6 +16,6 @@ android { } dependencies { - implementation "androidx.appcompat:appcompat:1.0.2" - implementation project(':widget') + implementation rootProject.ext.appcompat + implementation project(":widget") } diff --git a/build.gradle b/build.gradle index 3ed9aaf..775876f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,11 +4,15 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath "com.android.tools.build:gradle:3.5.2" + classpath "com.github.dcendents:android-maven-gradle-plugin:2.1" } } +plugins { + id "com.github.ben-manes.versions" version "0.27.0" +} + allprojects { repositories { google() @@ -18,12 +22,13 @@ allprojects { } ext { - compileSdkVersion = 28 + compileSdkVersion = 29 minSdkVersion = 15 - targetSdkVersion = 28 + targetSdkVersion = 29 - parse = "com.github.parse-community.Parse-SDK-Android:parse:1.19.0" - parseFacebookUtils = 'com.github.parse-community:ParseFacebookUtils-Android:1.13.0' - parseTwitterUtils = 'com.github.parse-community:ParseTwitterUtils-Android:1.13.0' + appcompat = "androidx.appcompat:appcompat:1.1.0" + parse = "com.github.parse-community.Parse-SDK-Android:parse:1.22.1" + parseFacebookUtils = "com.github.parse-community:ParseFacebookUtils-Android:1.14.0" + parseTwitterUtils = "com.github.parse-community:ParseTwitterUtils-Android:1.13.0" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 667288a..5c2d1cf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be25d9c..0ebb310 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Mar 08 09:51:04 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/gradlew b/gradlew index 91a7e26..b0d6d0a 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,20 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## ## @@ -6,20 +22,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +64,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +75,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +105,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +129,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +170,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec9973..15e1ee3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,14 +24,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +62,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +75,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/login/build.gradle b/login/build.gradle index c01c466..77696a0 100644 --- a/login/build.gradle +++ b/login/build.gradle @@ -18,7 +18,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -apply plugin: 'com.android.library' +apply plugin: "com.android.library" android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -35,11 +35,11 @@ android { } dependencies { - api "androidx.appcompat:appcompat:1.0.2" + api rootProject.ext.appcompat api rootProject.ext.parse compileOnly rootProject.ext.parseFacebookUtils compileOnly rootProject.ext.parseTwitterUtils } -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' +apply from: "https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle" diff --git a/widget/build.gradle b/widget/build.gradle index 4b3cc1c..fd971a7 100644 --- a/widget/build.gradle +++ b/widget/build.gradle @@ -17,7 +17,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -apply plugin: 'com.android.library' +apply plugin: "com.android.library" android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -36,13 +36,13 @@ android { dependencies { api rootProject.ext.parse - androidTestImplementation 'com.crittercism.dexmaker:dexmaker:1.4' - androidTestImplementation 'com.crittercism.dexmaker:dexmaker-mockito:1.4' - androidTestImplementation 'com.crittercism.dexmaker:dexmaker-dx:1.4' - androidTestImplementation 'org.mockito:mockito-core:1.10.19' - androidTestImplementation ('org.skyscreamer:jsonassert:1.2.3') { - exclude module: 'json' + androidTestImplementation "com.crittercism.dexmaker:dexmaker:1.4" + androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:1.4" + androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:1.4" + androidTestImplementation "org.mockito:mockito-core:1.10.19" + androidTestImplementation ("org.skyscreamer:jsonassert:1.2.3") { + exclude module: "json" } } -apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle' +apply from: "https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.1.0/gradle-android-javadocs.gradle"