Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cca734af authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update gradle and tests

parent c1739699

.github/workflows/test-dev.yml

+3 −5
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ jobs: 
          cache: 'gradle'

      - uses: gradle/wrapper-validation-action@v1



      - name: Run lint

        run: ./gradlew lintDebug

      - name: Run unit tests

        run: ./gradlew testDebugUnitTest

      - name: Check

        run: ./gradlew check

      - name: Archive results

        uses: actions/upload-artifact@v2

        with:
@@ -59,7 +57,7 @@ jobs: 
          wget -q -O org.tasks.apk https://f-droid.org/archive/org.tasks_110701.apk && adb install org.tasks.apk

          cd ..

      - name: Run connected tests

        run: ./gradlew connectedDebugAndroidTest

        run: ./gradlew connectedCheck

      - name: Archive results

        uses: actions/upload-artifact@v2

        with:

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ buildscript { 
    }



    dependencies {

        classpath 'com.android.tools.build:gradle:4.2.2'

        classpath 'com.android.tools.build:gradle:7.0.3'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

        classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"

    }

gradle/wrapper/gradle-wrapper.jar

+7.99 KiB (57.8 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+1 −2
Original line number Diff line number Diff line 
#Wed Apr 17 22:31:47 CEST 2019

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists
 
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

gradlew

+69 −48
Original line number Diff line number Diff line 
#!/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

#

#      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.

#



##############################################################################

##
@@ -6,12 +22,30 @@ 
##

##############################################################################



# 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"
@@ -30,6 +64,7 @@ die ( ) { 
cygwin=false

msys=false

darwin=false

nonstop=false

case "`uname`" in

  CYGWIN* )

    cygwin=true
@@ -40,33 +75,14 @@ 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.

if [ -n "$JAVA_HOME" ] ; then

    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -90,7 +106,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
@@ -110,11 +126,13 @@ if $darwin; then 
    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

if $cygwin ; then

# For Cygwin or MSYS, switch paths to Windows format before running java

if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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`

    SEP=""
@@ -138,27 +156,30 @@ if $cygwin ; then 
        else

            eval `echo args$i`="\"$arg\""

        fi

        i=$((i+1))

        i=`expr $i + 1`

    done

    case $i in

        (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" ;;

        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



# 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"



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