Skip to content

Commit e904896

Browse files
JawnnypooJawnnypoo
authored
Merge pull request #164 from parse-community/updates
Dependency updates
2 parents 2ffbff7 + 098b971 commit e904896

File tree

13 files changed

+119
-81
lines changed

13 files changed

+119
-81
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ branches:
66
language: android
77

88
jdk:
9-
- oraclejdk8
9+
- openjdk8
1010

1111
before_install:
1212
- mkdir "$ANDROID_HOME/licenses" || true

‎ParseLoginSampleBasic/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -14,8 +14,8 @@ android {
1414

1515
dependencies {
1616
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
17-
implementation project(':login')
18-
implementation "androidx.appcompat:appcompat:1.0.2"
17+
implementation project(":login")
18+
implementation rootProject.ext.appcompat
1919
implementation rootProject.ext.parse
2020
implementation rootProject.ext.parseFacebookUtils
2121
implementation rootProject.ext.parseTwitterUtils

‎ParseLoginSampleCodeCustomization/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -14,8 +14,8 @@ android {
1414

1515
dependencies {
1616
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
17-
implementation project(':login')
18-
implementation "androidx.appcompat:appcompat:1.0.2"
17+
implementation project(":login")
18+
implementation rootProject.ext.appcompat
1919
implementation rootProject.ext.parse
2020
implementation rootProject.ext.parseFacebookUtils
2121
implementation rootProject.ext.parseTwitterUtils

‎ParseLoginSampleLayoutOverride/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -14,8 +14,8 @@ android {
1414

1515
dependencies {
1616
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
17-
implementation project(':login')
18-
implementation "androidx.appcompat:appcompat:1.0.2"
17+
implementation project(":login")
18+
implementation rootProject.ext.appcompat
1919
implementation rootProject.ext.parse
2020
implementation rootProject.ext.parseFacebookUtils
2121
implementation rootProject.ext.parseTwitterUtils

‎ParseLoginSampleWithDispatchActivity/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -14,8 +14,8 @@ android {
1414

1515
dependencies {
1616
// rootProject.ext.* variables are defined in project gradle file, you can also use path here.
17-
implementation project(':login')
18-
implementation "androidx.appcompat:appcompat:1.0.2"
17+
implementation project(":login")
18+
implementation rootProject.ext.appcompat
1919
implementation rootProject.ext.parse
2020
implementation rootProject.ext.parseFacebookUtils
2121
implementation rootProject.ext.parseTwitterUtils

‎ParseUI-Widget-Sample/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: "com.android.application"
22

33
android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -16,6 +16,6 @@ android {
1616
}
1717

1818
dependencies {
19-
implementation "androidx.appcompat:appcompat:1.0.2"
20-
implementation project(':widget')
19+
implementation rootProject.ext.appcompat
20+
implementation project(":widget")
2121
}

‎build.gradle‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.3.2'
8-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
7+
classpath "com.android.tools.build:gradle:3.5.2"
8+
classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
99
}
1010
}
1111

12+
plugins {
13+
id "com.github.ben-manes.versions" version "0.27.0"
14+
}
15+
1216
allprojects {
1317
repositories {
1418
google()
@@ -18,12 +22,13 @@ allprojects {
1822
}
1923

2024
ext {
21-
compileSdkVersion = 28
25+
compileSdkVersion = 29
2226

2327
minSdkVersion = 15
24-
targetSdkVersion = 28
28+
targetSdkVersion = 29
2529

26-
parse = "com.github.parse-community.Parse-SDK-Android:parse:1.19.0"
27-
parseFacebookUtils = 'com.github.parse-community:ParseFacebookUtils-Android:1.13.0'
28-
parseTwitterUtils = 'com.github.parse-community:ParseTwitterUtils-Android:1.13.0'
30+
appcompat = "androidx.appcompat:appcompat:1.1.0"
31+
parse = "com.github.parse-community.Parse-SDK-Android:parse:1.22.1"
32+
parseFacebookUtils = "com.github.parse-community:ParseFacebookUtils-Android:1.14.0"
33+
parseTwitterUtils = "com.github.parse-community:ParseTwitterUtils-Android:1.13.0"
2934
}

‎gradle/wrapper/gradle-wrapper.jar‎

4.98 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Mar 08 09:51:04 CST 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

‎gradlew‎

Lines changed: 59 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,59 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
218

319
##############################################################################
420
##
521
## Gradle start up script for UN*X
622
##
723
##############################################################################
824

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
1142

1243
APP_NAME="Gradle"
1344
APP_BASE_NAME=`basename "$0"`
1445

46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
1549
# Use the maximum available, or set MAX_FD != -1 to use that value.
1650
MAX_FD="maximum"
1751

18-
warn ( ) {
52+
warn () {
1953
echo "$*"
2054
}
2155

22-
die ( ) {
56+
die () {
2357
echo
2458
echo "$*"
2559
echo
@@ -30,6 +64,7 @@ die ( ) {
3064
cygwin=false
3165
msys=false
3266
darwin=false
67+
nonstop=false
3368
case "`uname`" in
3469
CYGWIN* )
3570
cygwin=true
@@ -40,31 +75,11 @@ case "`uname`" in
4075
MINGW* )
4176
msys=true
4277
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
4381
esac
4482

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
50-
# Attempt to set APP_HOME
51-
# Resolve links: $0 may be a link
52-
PRG="$0"
53-
# Need this for relative symlinks.
54-
while [ -h "$PRG" ] ; do
55-
ls=`ls -ld "$PRG"`
56-
link=`expr "$ls" : '.*-> \(.*\)$'`
57-
if expr "$link" : '/.*' > /dev/null; then
58-
PRG="$link"
59-
else
60-
PRG=`dirname "$PRG"`"/$link"
61-
fi
62-
done
63-
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
65-
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
67-
6883
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6984

7085
# Determine the Java command to use to start the JVM.
@@ -90,7 +105,7 @@ location of your Java installation."
90105
fi
91106

92107
# Increase the maximum file descriptors if we can.
93-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
108+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
94109
MAX_FD_LIMIT=`ulimit -H -n`
95110
if [ $? -eq 0 ] ; then
96111
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +129,7 @@ fi
114129
if $cygwin ; then
115130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132+
JAVACMD=`cygpath --unix "$JAVACMD"`
117133

118134
# We build the pattern for arguments to be converted via cygpath
119135
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +170,19 @@ if $cygwin ; then
154170
esac
155171
fi
156172

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
173+
# Escape application args
174+
save () {
175+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176+
echo " "
160177
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
178+
APP_ARGS=$(save "$@")
179+
180+
# Collect all arguments for the java command, following the shell quoting and substitution rules
181+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182+
183+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185+
cd "$(dirname "$0")"
186+
fi
163187

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
188+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)