gradle: update wrapper

README.md

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

app/build.gradle

@@ -57,7 +57,7 @@ dependencies {
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.google.android.material:material:1.2.0-alpha01'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta05'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
     implementation 'androidx.preference:preference:1.1.0'
     //DNS
     implementation 'org.pcap4j:pcap4j-core:1.8.2'
@@ -66,7 +66,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.squareup.okhttp3:okhttp:4.2.0'
     //Analytics
-    googleReleaseImplementation 'com.google.firebase:firebase-core:17.2.0'
+    googleReleaseImplementation 'com.google.firebase:firebase-core:17.2.1'
     googleReleaseImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
 }
 

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

@@ -245,7 +245,7 @@ public class Daedalus extends Application {
     }
 
     public static void donate() {
-        openUri("https://qr.alipay.com/a6x07022gffiehykicipv1a");
+        openUri("https://qr.alipay.com/FKX04751EZDP0SQ0BOT137");
     }
 
     public static void openUri(String uri) {

build.gradle

@@ -9,8 +9,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
-        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'com.google.gms:google-services:4.3.3'
         classpath 'io.fabric.tools:gradle:1.31.0'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Aug 23 01:02:45 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.5.1-bin.zip

gradlew

@@ -1,5 +1,21 @@
 #!/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
+#
+#      https://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.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -10,38 +26,38 @@
 # Resolve links: $0 may be a link
 PRG="$0"
 # Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
+while [ -h "$PRG" ]; do
-    ls=`ls -ld "$PRG"`
+  ls=$(ls -ld "$PRG")
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+  link=$(expr "$ls" : '.*-> \(.*\)$')
-    if expr "$link" : '/.*' > /dev/null; then
+  if expr "$link" : '/.*' >/dev/null; then
-        PRG="$link"
+    PRG="$link"
-    else
+  else
-        PRG=`dirname "$PRG"`"/$link"
+    PRG=$(dirname "$PRG")"/$link"
-    fi
+  fi
 done
-SAVED="`pwd`"
+SAVED="$(pwd)"
-cd "`dirname \"$PRG\"`/" >/dev/null
+cd "$(dirname \"$PRG\")/" >/dev/null
-APP_HOME="`pwd -P`"
+APP_HOME="$(pwd -P)"
 cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn() {
-    echo "$*"
+  echo "$*"
 }
 
-die ( ) {
+die() {
-    echo
+  echo
-    echo "$*"
+  echo "$*"
-    echo
+  echo
-    exit 1
+  exit 1
 }
 
 # OS specific support (must be 'true' or 'false').
@@ -49,124 +65,119 @@ cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$(uname)" in
-  CYGWIN* )
+CYGWIN*)
-    cygwin=true
+  cygwin=true
-    ;;
+  ;;
-  Darwin* )
+Darwin*)
-    darwin=true
+  darwin=true
-    ;;
+  ;;
-  MINGW* )
+MINGW*)
-    msys=true
+  msys=true
-    ;;
+  ;;
-  NONSTOP* )
+NONSTOP*)
-    nonstop=true
+  nonstop=true
-    ;;
+  ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
+if [ -n "$JAVA_HOME" ]; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+  if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-        # IBM's JDK on AIX uses strange locations for the executables
+    # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+    JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
+  else
-        JAVACMD="$JAVA_HOME/bin/java"
+    JAVACMD="$JAVA_HOME/bin/java"
-    fi
+  fi
-    if [ ! -x "$JAVACMD" ] ; then
+  if [ ! -x "$JAVACMD" ]; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+    die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
+  fi
 else
-    JAVACMD="java"
+  JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+  which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ]; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+  MAX_FD_LIMIT=$(ulimit -H -n)
-    if [ $? -eq 0 ] ; then
+  if [ $? -eq 0 ]; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+    if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
-            MAX_FD="$MAX_FD_LIMIT"
+      MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
     fi
+    ulimit -n $MAX_FD
+    if [ $? -ne 0 ]; then
+      warn "Could not set maximum file descriptor limit: $MAX_FD"
+    fi
+  else
+    warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+  fi
 fi
 
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+  GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ]; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+  APP_HOME=$(cygpath --path --mixed "$APP_HOME")
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+  CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")
-    JAVACMD=`cygpath --unix "$JAVACMD"`
+  JAVACMD=$(cygpath --unix "$JAVACMD")
 
-    # We build the pattern for arguments to be converted via cygpath
+  # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+  ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
-    SEP=""
+  SEP=""
-    for dir in $ROOTDIRSRAW ; do
+  for dir in $ROOTDIRSRAW; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
+    ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
+    SEP="|"
-    done
+  done
-    OURCYGPATTERN="(^($ROOTDIRS))"
+  OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
+  # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+  if [ "$GRADLE_CYGPATTERN" != "" ]; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+  fi
+  # Now convert the arguments - kludge to limit ourselves to /bin/sh
+  i=0
+  for arg in "$@"; do
+    CHECK=$(echo "$arg" | egrep -c "$OURCYGPATTERN" -)
+    CHECK2=$(echo "$arg" | egrep -c "^-") ### Determine if an option
+
+    if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then ### Added a condition
+      eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg")
+    else
+      eval $(echo args$i)="\"$arg\""
     fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=$(expr $i + 1)
-    i=0
+  done
-    for arg in "$@" ; do
+  case $i in
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+  0) set -- ;;
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+  1) set -- "$args0" ;;
-
+  2) set -- "$args0" "$args1" ;;
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+  3) set -- "$args0" "$args1" "$args2" ;;
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+  4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        else
+  5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-            eval `echo args$i`="\"$arg\""
+  6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        fi
+  7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        i=$((i+1))
+  8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-    done
+  9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    case $i in
+  esac
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
 # Escape application args
-save ( ) {
+save() {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+  for i; do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; done
-    echo " "
+  echo " "
 }
 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" "$@"

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      https://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
@@ -14,7 +30,7 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome