Skip to content

Commit e2cea48

Browse files
PeratXPeratX
committed
gradle: update wrapper
1 parent 1bc68d0 commit e2cea48

File tree

8 files changed

+143
-117
lines changed

8 files changed

+143
-117
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# iTXTech Daedalus
22

3-
[![Donate](https://img.shields.io/badge/alipay-donate-yellow.svg)](https://qr.alipay.com/a6x07022gffiehykicipv1a)
3+
[![Donate](https://img.shields.io/badge/alipay-donate-yellow.svg)](https://qr.alipay.com/FKX04751EZDP0SQ0BOT137)
44
[![Build Status](https://travis-ci.org/iTXTech/Daedalus.svg?branch=master)](https://travis-ci.org/iTXTech/Daedalus)
55
[![Jenkins](https://img.shields.io/jenkins/s/http/dev.itxtech.org:10298/job/Daedalus.svg)](http://dev.itxtech.org:10298/job/Daedalus/)
66

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757
implementation 'androidx.percentlayout:percentlayout:1.0.0'
5858
implementation 'androidx.cardview:cardview:1.0.0'
5959
implementation 'com.google.android.material:material:1.2.0-alpha01'
60-
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta05'
60+
implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
6161
implementation 'androidx.preference:preference:1.1.0'
6262
//DNS
6363
implementation 'org.pcap4j:pcap4j-core:1.8.2'
@@ -66,7 +66,7 @@ dependencies {
6666
implementation 'com.google.code.gson:gson:2.8.5'
6767
implementation 'com.squareup.okhttp3:okhttp:4.2.0'
6868
//Analytics
69-
googleReleaseImplementation 'com.google.firebase:firebase-core:17.2.0'
69+
googleReleaseImplementation 'com.google.firebase:firebase-core:17.2.1'
7070
googleReleaseImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
7171
}
7272

‎app/src/main/java/org/itxtech/daedalus/Daedalus.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public static void updateShortcut(Context context) {
245245
}
246246

247247
public static void donate() {
248-
openUri("https://qr.alipay.com/a6x07022gffiehykicipv1a");
248+
openUri("https://qr.alipay.com/FKX04751EZDP0SQ0BOT137");
249249
}
250250

251251
public static void openUri(String uri) {

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.5.1'
13-
classpath 'com.google.gms:google-services:4.3.2'
12+
classpath 'com.android.tools.build:gradle:3.5.2'
13+
classpath 'com.google.gms:google-services:4.3.3'
1414
classpath 'io.fabric.tools:gradle:1.31.0'
1515
}
1616
}

‎gradle/wrapper/gradle-wrapper.jar‎

4.39 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-
#Wed Aug 23 01:02:45 CST 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https://services.gradle.org/distributions/gradle-5.5.1-bin.zip

‎gradlew‎

Lines changed: 119 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

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+
# https://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+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -10,163 +26,158 @@
1026
# Resolve links: $0 may be a link
1127
PRG="$0"
1228
# Need this for relative symlinks.
13-
while [ -h "$PRG" ] ; do
14-
ls=`ls -ld "$PRG"`
15-
link=`expr "$ls" : '.*-> \(.*\)$'`
16-
if expr "$link" : '/.*' > /dev/null; then
17-
PRG="$link"
18-
else
19-
PRG=`dirname "$PRG"`"/$link"
20-
fi
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
2137
done
22-
SAVED="`pwd`"
23-
cd "`dirname \"$PRG\"`/" >/dev/null
24-
APP_HOME="`pwd -P`"
38+
SAVED="$(pwd)"
39+
cd "$(dirname \"$PRG\")/" >/dev/null
40+
APP_HOME="$(pwd -P)"
2541
cd "$SAVED" >/dev/null
2642

2743
APP_NAME="Gradle"
28-
APP_BASE_NAME=`basename "$0"`
44+
APP_BASE_NAME=$(basename "$0")
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
3551

36-
warn ( ) {
37-
echo "$*"
52+
warn() {
53+
echo "$*"
3854
}
3955

40-
die ( ) {
41-
echo
42-
echo "$*"
43-
echo
44-
exit 1
56+
die() {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
4561
}
4662

4763
# OS specific support (must be 'true' or 'false').
4864
cygwin=false
4965
msys=false
5066
darwin=false
5167
nonstop=false
52-
case "`uname`" in
53-
CYGWIN* )
54-
cygwin=true
55-
;;
56-
Darwin* )
57-
darwin=true
58-
;;
59-
MINGW* )
60-
msys=true
61-
;;
62-
NONSTOP* )
63-
nonstop=true
64-
;;
68+
case "$(uname)" in
69+
CYGWIN*)
70+
cygwin=true
71+
;;
72+
Darwin*)
73+
darwin=true
74+
;;
75+
MINGW*)
76+
msys=true
77+
;;
78+
NONSTOP*)
79+
nonstop=true
80+
;;
6581
esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

6985
# Determine the Java command to use to start the JVM.
70-
if [ -n "$JAVA_HOME" ] ; then
71-
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72-
# IBM's JDK on AIX uses strange locations for the executables
73-
JAVACMD="$JAVA_HOME/jre/sh/java"
74-
else
75-
JAVACMD="$JAVA_HOME/bin/java"
76-
fi
77-
if [ ! -x "$JAVACMD" ] ; then
78-
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
86+
if [ -n "$JAVA_HOME" ]; then
87+
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
88+
# IBM's JDK on AIX uses strange locations for the executables
89+
JAVACMD="$JAVA_HOME/jre/sh/java"
90+
else
91+
JAVACMD="$JAVA_HOME/bin/java"
92+
fi
93+
if [ ! -x "$JAVACMD" ]; then
94+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
7995
8096
Please set the JAVA_HOME variable in your environment to match the
8197
location of your Java installation."
82-
fi
98+
fi
8399
else
84-
JAVACMD="java"
85-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
100+
JAVACMD="java"
101+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86102
87103
Please set the JAVA_HOME variable in your environment to match the
88104
location of your Java installation."
89105
fi
90106

91107
# Increase the maximum file descriptors if we can.
92-
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93-
MAX_FD_LIMIT=`ulimit -H -n`
94-
if [ $? -eq 0 ] ; then
95-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96-
MAX_FD="$MAX_FD_LIMIT"
97-
fi
98-
ulimit -n $MAX_FD
99-
if [ $? -ne 0 ] ; then
100-
warn "Could not set maximum file descriptor limit: $MAX_FD"
101-
fi
102-
else
103-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
108+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ]; then
109+
MAX_FD_LIMIT=$(ulimit -H -n)
110+
if [ $? -eq 0 ]; then
111+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
112+
MAX_FD="$MAX_FD_LIMIT"
113+
fi
114+
ulimit -n $MAX_FD
115+
if [ $? -ne 0 ]; then
116+
warn "Could not set maximum file descriptor limit: $MAX_FD"
104117
fi
118+
else
119+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
120+
fi
105121
fi
106122

107123
# For Darwin, add options to specify how the application appears in the dock
108124
if $darwin; then
109-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
125+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110126
fi
111127

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
114-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116-
JAVACMD=`cygpath --unix "$JAVACMD"`
117-
118-
# We build the pattern for arguments to be converted via cygpath
119-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120-
SEP=""
121-
for dir in $ROOTDIRSRAW ; do
122-
ROOTDIRS="$ROOTDIRS$SEP$dir"
123-
SEP="|"
124-
done
125-
OURCYGPATTERN="(^($ROOTDIRS))"
126-
# Add a user-defined pattern to the cygpath arguments
127-
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ]; then
130+
APP_HOME=$(cygpath --path --mixed "$APP_HOME")
131+
CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")
132+
JAVACMD=$(cygpath --unix "$JAVACMD")
133+
134+
# We build the pattern for arguments to be converted via cygpath
135+
ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
136+
SEP=""
137+
for dir in $ROOTDIRSRAW; do
138+
ROOTDIRS="$ROOTDIRS$SEP$dir"
139+
SEP="|"
140+
done
141+
OURCYGPATTERN="(^($ROOTDIRS))"
142+
# Add a user-defined pattern to the cygpath arguments
143+
if [ "$GRADLE_CYGPATTERN" != "" ]; then
144+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
145+
fi
146+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
147+
i=0
148+
for arg in "$@"; do
149+
CHECK=$(echo "$arg" | egrep -c "$OURCYGPATTERN" -)
150+
CHECK2=$(echo "$arg" | egrep -c "^-") ### Determine if an option
151+
152+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then ### Added a condition
153+
eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg")
154+
else
155+
eval $(echo args$i)="\"$arg\""
129156
fi
130-
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131-
i=0
132-
for arg in "$@" ; do
133-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134-
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135-
136-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138-
else
139-
eval `echo args$i`="\"$arg\""
140-
fi
141-
i=$((i+1))
142-
done
143-
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154-
esac
157+
i=$(expr $i + 1)
158+
done
159+
case $i in
160+
0) set -- ;;
161+
1) set -- "$args0" ;;
162+
2) set -- "$args0" "$args1" ;;
163+
3) set -- "$args0" "$args1" "$args2" ;;
164+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170+
esac
155171
fi
156172

157173
# Escape application args
158-
save ( ) {
159-
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160-
echo " "
174+
save() {
175+
for i; do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; done
176+
echo " "
161177
}
162178
APP_ARGS=$(save "$@")
163179

164180
# Collect all arguments for the java command, following the shell quoting and substitution rules
165181
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166182

167-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169-
cd "$(dirname "$0")"
170-
fi
171-
172183
exec "$JAVACMD" "$@"

‎gradlew.bat‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

0 commit comments

Comments
 (0)