diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index abf6f669d..51a1811df 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -8,22 +8,23 @@ on: jobs: test: name: Instrumented Tests, SDK ${{ matrix.api-level }} - runs-on: macos-11 + runs-on: macos-12 strategy: + fail-fast: false matrix: api-level: - 23 # Android 5, minSdkVersion - 27 # Android 8, has caused problems in the past - # SDK 29 causes frequent problems with the emulator, not sure why. - # Hoping SDK 30 is close enough - # - 29 # Android 10, targetSdkVersion - - 30 # Android 11, latest public release + - 30 # Android 11 - latest where tests pass + - 33 # Android 13 - targetSdkVersion + # Fails currently, need to debug before we can upgrade + # - 34 # Android 14, latest public release steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Cache steps all from the example at https://github.com/ReactiveCircus/android-emulator-runner - - name: Gradle cache + - name: Restore Gradle cache uses: actions/cache@v3 with: path: | @@ -31,46 +32,96 @@ jobs: ~/.gradle/wrapper key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }} - - name: AVD cache + # You can use sdkmanager --list to locate available packages. + # In our case, API=27 with google_apis is only available with x86, but + # later APIs (33,34) do not have x86 + - name: Set AVD Architecture Based on API Level + run: echo "ARCH=$(if [ ${{ matrix.api-level }} -eq 27 ]; then echo 'x86'; else echo 'x86_64'; fi)" >> $GITHUB_ENV + + - name: Restore AVD cache uses: actions/cache@v3 id: avd-cache with: path: | ~/.android/avd/* ~/.android/adb* - key: avd-${{ matrix.api-level }}-20220105-1 + key: avd-${{ matrix.api-level }}-${{ env.ARCH }}-20231227 - name: Create AVD and generate snapshot for caching if: steps.avd-cache.outputs.cache-hit != 'true' uses: reactivecircus/android-emulator-runner@v2 with: api-level: ${{ matrix.api-level }} + arch: ${{ env.ARCH }} + cores: 3 force-avd-creation: true - emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none - disable-animations: false + emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -grpc 8554 -verbose -timezone America/New_York + disable-animations: true target: google_apis - ndk: 22.1.7171670 - # I think this might be a quick fix for intermittent build failures waiting for the emaultor to boot - emulator-build: 7425822 + ndk: 26.1.10909125 + pre-emulator-launch-script: | + cat ~/.android/avd/test.avd/config.ini || true + cat ~/.android/avd/test.avd/hardware-qemu.ini || true script: echo "Generated AVD snapshot for caching." + - name: Set Java 11 run: | echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV + - name: Copy iNat config files run: | sed -E 's//>/' > iNaturalist/src/main/res/values/config.xml cp iNaturalist/google-services.example.json iNaturalist/google-services.json + # Do this in a distinct step so we get separate timing information + - name: Compile + run: ./gradlew assembleDebug assembleAndroidTest + - name: Run instrumented tests uses: reactivecircus/android-emulator-runner@v2 + timeout-minutes: 30 with: api-level: ${{ matrix.api-level }} + arch: ${{ env.ARCH }} + cores: 3 force-avd-creation: false - emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -grpc 8554 -verbose -timezone America/New_York disable-animations: true target: google_apis - ndk: 22.1.7171670 - script: ./gradlew connectedCheck -x :smoothrescale:connectedDebugAndroidTest + ndk: 26.1.10909125 + pre-emulator-launch-script: | + cat ~/.android/avd/test.avd/config.ini || true + cat ~/.android/avd/test.avd/hardware-qemu.ini || true + script: | + mkdir screenshots + $ANDROID_HOME/platform-tools/adb exec-out screencap -p > screenshots/0-early-boot.png + sleep 120 + $ANDROID_HOME/platform-tools/adb exec-out screencap -p > screenshots/1-late-boot.png + $ANDROID_HOME/platform-tools/adb shell am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS + sleep 30 + $ANDROID_HOME/platform-tools/adb exec-out screencap -p > screenshots/2-pretest.png + ./gradlew connectedCheck + $ANDROID_HOME/platform-tools/adb exec-out screencap -p > screenshots/3-posttest.png + + - name: Store Build Reports + uses: actions/upload-artifact@v4 + if: always() + with: + name: Build Reports - SDK ${{ matrix.api-level }} ${{ env.ARCH }} + path: | + iNaturalist/build/reports + smoothrescale/build/reports + library/build/reports + urlImageViewHelper/build/reports + screenshots + + - name: Store APK + uses: actions/upload-artifact@v4 + if: always() + with: + name: APK - SDK ${{ matrix.api-level }} ${{ env.ARCH }} + path: iNaturalist/build/outputs/apk + notify: name: Notify Slack needs: test diff --git a/build.gradle b/build.gradle index c1a9b4c8c..d433a3bcb 100644 --- a/build.gradle +++ b/build.gradle @@ -5,12 +5,10 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' - classpath 'com.google.gms:google-services:4.3.3' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.3.14' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' } - - } allprojects { @@ -24,3 +22,11 @@ allprojects { resolutionStrategy.force 'com.android.support:support-annotations:25.0.1' } } + +// Global properties used in all build.gradle files +ext { + minSdkVersion = 23 + targetSdkVersion = 33 + compileSdkVersion = 33 +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64a8..d64cd4917 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 63963855a..e6aba2515 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Thu Dec 31 15:04:40 EST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/gradlew b/gradlew index 91a7e269e..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -1,79 +1,127 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | 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 # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -82,83 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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" ;; - 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=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730b..6689b85be 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@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 @rem Gradle startup script for Windows @@ -8,20 +24,24 @@ @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=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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 set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,44 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz 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. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -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 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/iNaturalist/build.gradle b/iNaturalist/build.gradle index b1c939cbe..d2ba85706 100644 --- a/iNaturalist/build.gradle +++ b/iNaturalist/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.5.20' + ext.kotlin_version = '1.9.20' repositories { mavenCentral() maven { url "https://jitpack.io" } @@ -34,8 +34,9 @@ allprojects { } android { - compileSdkVersion 33 - buildToolsVersion '34.0.0' + namespace 'org.inaturalist.android' + + compileSdk rootProject.ext.compileSdkVersion useLibrary 'org.apache.http.legacy' buildFeatures { @@ -52,16 +53,17 @@ android { } } - lintOptions { + lint { checkReleaseBuilds false } defaultConfig { applicationId "org.inaturalist.android" - minSdkVersion 23 - targetSdkVersion 33 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + multiDexEnabled true - renderscriptTargetApi 33 + renderscriptTargetApi rootProject.ext.targetSdkVersion renderscriptSupportModeEnabled true testInstrumentationRunner = "org.inaturalist.android.DefaultTestRunner" packagingOptions { @@ -69,7 +71,6 @@ android { } } - ndkVersion "22.1.7171670" buildTypes { debug { minifyEnabled false @@ -85,18 +86,23 @@ android { } packagingOptions { - exclude 'META-INF/DEPENDENCIES' - exclude 'META-INF/NOTICE' - exclude 'META-INF/LICENSE' - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/NOTICE.txt' - exclude 'LICENSE.txt' + resources { + excludes += ['META-INF/DEPENDENCIES', + 'META-INF/NOTICE', + 'META-INF/LICENSE', + 'META-INF/LICENSE.txt', + 'META-INF/NOTICE.txt', + 'LICENSE.txt'] + } } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } } dependencies { @@ -153,6 +159,7 @@ dependencies { annotationProcessor 'androidx.hilt:hilt-compiler:1.0.0' androidTestImplementation 'androidx.core:core-ktx:1.3.2' androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + androidTestImplementation 'androidx.test:core-ktx:1.5.0' androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0' diff --git a/iNaturalist/src/main/AndroidManifest.xml b/iNaturalist/src/main/AndroidManifest.xml index 2c17952bd..35a99ad7e 100644 --- a/iNaturalist/src/main/AndroidManifest.xml +++ b/iNaturalist/src/main/AndroidManifest.xml @@ -1,10 +1,9 @@ + android:versionCode="600" + android:versionName="1.30.7"> diff --git a/iNaturalist/src/main/java/org/inaturalist/android/AboutFragment.java b/iNaturalist/src/main/java/org/inaturalist/android/AboutFragment.java index b7cc0097b..c7c58c91f 100644 --- a/iNaturalist/src/main/java/org/inaturalist/android/AboutFragment.java +++ b/iNaturalist/src/main/java/org/inaturalist/android/AboutFragment.java @@ -123,28 +123,24 @@ public boolean onPreferenceClick(Preference preference) { }); mDonate.setOnPreferenceClickListener(preference -> { - // Open donation page Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(DONATION_URL)); startActivity(browserIntent); return false; }); mShop.setOnPreferenceClickListener(preference -> { - // Open donation page Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(SHOP_URL)); startActivity(browserIntent); return false; }); mPrivacyPolicy.setOnPreferenceClickListener(preference -> { - // Open donation page Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(PRIVACY_POLICY_URL)); startActivity(browserIntent); return false; }); mTOS.setOnPreferenceClickListener(preference -> { - // Open donation page Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(TOS_URL)); startActivity(browserIntent); return false; diff --git a/iNaturalist/src/main/java/org/inaturalist/android/BindingAdapterUtils.java b/iNaturalist/src/main/java/org/inaturalist/android/BindingAdapterUtils.java index abcd8e023..e295b2b70 100644 --- a/iNaturalist/src/main/java/org/inaturalist/android/BindingAdapterUtils.java +++ b/iNaturalist/src/main/java/org/inaturalist/android/BindingAdapterUtils.java @@ -11,7 +11,7 @@ import org.tinylog.Logger; public class BindingAdapterUtils { - @BindingAdapter("bind:increaseTouch") + @BindingAdapter("inat_increaseTouch") public static void increaseTouch(ImageView view, double value) { ActivityHelper helper = new ActivityHelper(view.getContext()); diff --git a/iNaturalist/src/main/res/layout/annotation.xml b/iNaturalist/src/main/res/layout/annotation.xml index 6c378c917..239a831b4 100644 --- a/iNaturalist/src/main/res/layout/annotation.xml +++ b/iNaturalist/src/main/res/layout/annotation.xml @@ -42,7 +42,7 @@ android:id="@+id/expand" android:layout_width="24dp" android:layout_height="24dp" - bind:increaseTouch='@{40}' + inat_increaseTouch='@{40}' android:layout_alignParentEnd="true" android:layout_alignParentTop="true" android:clickable="true" @@ -59,7 +59,7 @@ android:layout_height="wrap_content"> diff --git a/smoothrescale/build.gradle b/smoothrescale/build.gradle index 9fb2c204a..9a94d7b1e 100644 --- a/smoothrescale/build.gradle +++ b/smoothrescale/build.gradle @@ -1,11 +1,13 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 + namespace 'com.schokoladenbrown' + compileSdk rootProject.ext.compileSdkVersion defaultConfig { - minSdkVersion 14 - targetSdkVersion 29 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -14,7 +16,11 @@ android { } } - sourceSets.main.jni.srcDirs = [] + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + task ndkBuild(type: Exec, description: 'Compile JNI source via NDK') { def ndkDir = System.getenv('ANDROID_NDK_HOME') @@ -25,7 +31,7 @@ android { 'APP_BUILD_SCRIPT=src/main/jni/Android.mk', 'NDK_APPLICATION_MK=src/main/jni/Application.mk' } - ndkVersion '22.1.7171670' + ndkVersion '26.1.10909125' tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn ndkBuild @@ -33,6 +39,9 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.0' + testImplementation 'junit:junit:4.13.2' + + androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.5.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' } diff --git a/smoothrescale/src/androidTest/java/com/schokoladenbrown/smoothrescale/AndroidTests.java b/smoothrescale/src/androidTest/java/com/schokoladenbrown/smoothrescale/AndroidTests.java new file mode 100644 index 000000000..8f3f69412 --- /dev/null +++ b/smoothrescale/src/androidTest/java/com/schokoladenbrown/smoothrescale/AndroidTests.java @@ -0,0 +1,35 @@ +package com.schokoladenbrown.smoothrescale; + +import static org.junit.Assert.*; + +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; + +import androidx.test.InstrumentationRegistry; + +import com.schokoladenbrown.Smooth; + +import org.junit.Test; + +public class AndroidTests { + + @Test + public void testRescale() { + // get Context of the app under test + Context appContext = InstrumentationRegistry.getTargetContext(); + Bitmap src = BitmapFactory.decodeResource(appContext.getResources(), com.schokoladenbrown.test.R.drawable.black_with_white_border); + assertNotNull(src); + // Checks pixel is white + assertEquals(0xffffffff, src.getPixel(0, 0)); + // Checks pixel is black + assertEquals(0xff000000, src.getPixel(src.getWidth() / 2, src.getHeight() / 2)); + + Bitmap dst = Smooth.rescale(src, 80, 80, Smooth.Algo.BILINEAR); + assertNotNull(dst); + assertEquals(80, dst.getWidth()); + assertEquals(80, dst.getHeight()); + assertEquals(0xffffffff, dst.getPixel(0, 0)); + assertEquals(0xff000000, dst.getPixel(dst.getWidth() / 2, dst.getHeight() / 2)); + } +} diff --git a/smoothrescale/src/androidTest/java/com/schokoladenbrown/smoothrescale/ApplicationTest.java b/smoothrescale/src/androidTest/java/com/schokoladenbrown/smoothrescale/ApplicationTest.java deleted file mode 100644 index 41480b067..000000000 --- a/smoothrescale/src/androidTest/java/com/schokoladenbrown/smoothrescale/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.schokoladenbrown.smoothrescale; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} diff --git a/smoothrescale/src/androidTest/res/drawable/black_with_white_border.png b/smoothrescale/src/androidTest/res/drawable/black_with_white_border.png new file mode 100644 index 000000000..f115078e2 Binary files /dev/null and b/smoothrescale/src/androidTest/res/drawable/black_with_white_border.png differ diff --git a/smoothrescale/src/main/AndroidManifest.xml b/smoothrescale/src/main/AndroidManifest.xml index bfd334bf3..fe4ef6fcd 100644 --- a/smoothrescale/src/main/AndroidManifest.xml +++ b/smoothrescale/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - +