diff --git a/android/app/build.gradle b/android/app/build.gradle index e0f4bf48..24e2e07d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -30,10 +30,10 @@ repositories { } dependencies { - implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion" - implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion" implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" + implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion" + implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion" implementation project(':capacitor-android') testImplementation "junit:junit:$junitVersion" androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion" diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index 0b773970..f1b42451 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -19,7 +19,3 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile - -# Class for seperated android headless background task -# [capacitor-background-fetch] -#-keep class **BackgroundFetchHeadlessTask { *; } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 4b0f6e3c..4bd6c1ff 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,22 +1,25 @@ - - + + + + + + - - - @@ -34,10 +37,20 @@ - - + + + + + + diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json index d634b234..fcbe05b4 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -69,6 +69,6 @@ }, { "pkg": "capacitor-secure-storage-plugin", - "classpath": "com.whitestein.securestorage.SecureStoragePlugin" + "classpath": "com.whitestein.securestorage.SecureStoragePluginPlugin" } ] diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..41d9927a 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradlew b/android/gradlew index 4f906e0c..1b6c7873 100755 --- a/android/gradlew +++ b/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,101 @@ # ############################################################################## -## -## 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/master/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/. +# ############################################################################## # 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 +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." 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. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -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 - 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 -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 - -# 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="" - 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\"" - fi - 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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# 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. -# 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" +# 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" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + 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 + # 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 +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/android/variables.gradle b/android/variables.gradle index 2dbd75af..777bd7e8 100644 --- a/android/variables.gradle +++ b/android/variables.gradle @@ -7,10 +7,10 @@ ext { androidxCoordinatorLayoutVersion = '1.2.0' androidxCoreVersion = '1.8.0' androidxFragmentVersion = '1.4.1' + coreSplashScreenVersion = '1.0.0-rc01' + androidxWebkitVersion = '1.4.0' junitVersion = '4.13.2' androidxJunitVersion = '1.1.3' androidxEspressoCoreVersion = '3.4.0' cordovaAndroidVersion = '10.1.1' - coreSplashScreenVersion = '1.0.0-rc01' - androidxWebkitVersion = '1.4.0' } \ No newline at end of file diff --git a/ios/App/Podfile b/ios/App/Podfile index 0447ff27..dd8eface 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -37,7 +37,6 @@ target 'App' do # Add your Pods here end - post_install do |installer| assertDeploymentTarget(installer) end diff --git a/package-lock.json b/package-lock.json index 671d16fb..d25fc10c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -626,9 +626,9 @@ } }, "magic-string": { - "version": "0.26.4", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.4.tgz", - "integrity": "sha512-e5uXtVJ22aEpK9u1+eQf0fSxHeqwyV19K+uGnlROCxUhzwRip9tBsaMViK/0vC3viyPd5Gtucp3UmEp/Q2cPTQ==", + "version": "0.26.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.5.tgz", + "integrity": "sha512-yXUIYOOQnEHKHOftp5shMWpB9ImfgfDJpapa38j/qMtTj5QHWucvxP4lUtuRmHT9vAzvtpHkWKXW9xBwimXeNg==", "dev": true, "requires": { "sourcemap-codec": "^1.4.8" @@ -705,17 +705,17 @@ } }, "@awesome-cordova-plugins/calendar": { - "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/calendar/-/calendar-5.44.0.tgz", - "integrity": "sha512-0SqIV6EZODjuSV7p+jtyTfS0fNMi3uN63MJvSneSYECC2/EqmiH5b6mwGJmJ+IIoz9az3dDjEYIo7+ipVyLOSQ==", + "version": "5.45.0", + "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/calendar/-/calendar-5.45.0.tgz", + "integrity": "sha512-Pejmj4lPLPDeb6ppwacgl8l1IUXDm5amuzTKvl41P336czhF4G7hENk/s9HjOb8273NNzhu2/CMwTWssKT3G3g==", "requires": { "@types/cordova": "^0.0.34" } }, "@awesome-cordova-plugins/core": { - "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/core/-/core-5.44.0.tgz", - "integrity": "sha512-LFa0RQyKoiMoh8GiFTOUh+SHdxs6XiozCAzOqq0YUrAAGb/sQRwZ+pDtqw0RTSQqN7DV3FH8ayeuHX8LEm3bNA==", + "version": "5.45.0", + "resolved": "https://registry.npmjs.org/@awesome-cordova-plugins/core/-/core-5.45.0.tgz", + "integrity": "sha512-VrFNy6KLu3yyIKX3+6knUTDfSy59MPWUDni31ypGIQyxZv0eInuAgy3D4dhEdSbTkCIRyF40u4CJk4bN5zUYzQ==", "requires": { "@types/cordova": "^0.0.34" } @@ -2097,9 +2097,9 @@ } }, "@capacitor/android": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.1.0.tgz", - "integrity": "sha512-aYHvpYVlS6WC+bG9jJfwqgHMxTw3e8f3taNnl/y9qCjglmMmtFcZWFAVLlOleVK4Q7olSirqjx37f0ppvxRTLg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.3.0.tgz", + "integrity": "sha512-JnyQsxq44wLFPQ1sN1sMISNbVuNVHXdUdseil1mNsag3JOKu1BkLCyC3aqI4ioce63fK6VtoUIvzR4YzqBn1yg==", "dev": true }, "@capacitor/app": { @@ -2113,9 +2113,9 @@ "integrity": "sha512-tPOA/eYDJdDeMFd+A3I8teuGfPP0GEqhWtMzH8z5r2tW40iJ/mL8qH5NgVLMZ3uvs7gN2LfQTCMNJvl0F/WdBw==" }, "@capacitor/cli": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-4.1.0.tgz", - "integrity": "sha512-SkMtohfjZS0tJdCtoqugHQIYJ4DowjXk4yQzDFXN3MnhjAKEQmB7QcZY5R8o9NoPMx0ngw2Bzm00e7RdyERvzg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-4.3.0.tgz", + "integrity": "sha512-+IBIJvxpHWSrtfb6XxPSh5m5h5ijLBqh0aGPxvj0nm7mXUwkT/fuQbeEUVCwIoImmYZCuUAFIkQFB0nWd74bEg==", "dev": true, "requires": { "@ionic/cli-framework-output": "^2.2.5", @@ -2138,9 +2138,9 @@ } }, "@capacitor/core": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-4.1.0.tgz", - "integrity": "sha512-bMYFnC5l5n11D/kLTz9TOOJfUH+nQqYRwzG7h5h4AXIm8aFxH5ZY3iFlDZd7R4xcyrlnfxzfoooSH9trPjRBLA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-4.3.0.tgz", + "integrity": "sha512-zb225feaiHYcttHqw7SnKVj9gjOh3yoM2ol0Efky4kd80qZvqPHt7nRI1XZmGUKid5j3AVggULd5rRke5OEOXQ==", "requires": { "tslib": "^2.1.0" } @@ -2156,9 +2156,9 @@ "integrity": "sha512-mHcTU+z2SiGL0azdr4Pn9Qzq+AHKBIoDzAOUVAco+OyFsASdMu/+d/DB2MipA4VvO2QNnbcvvtSFwDnCoyg+aw==" }, "@capacitor/filesystem": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-4.1.1.tgz", - "integrity": "sha512-qpXIR4kxW2age91EiDFOh5KpZ5SUFs1rgWmNrO60wo+AT3Ok0Dzfol2aLSqvNAenDGUilA44ThJPeE+ArRPVzg==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-4.1.2.tgz", + "integrity": "sha512-akQTgNZBIRE5mN8IPagd4TUk9vx8c2xTllX8yBRzf4BhHHkQPzAnEVikmX+qB/114DvRMh3l2s8mtpXiWOg9NQ==" }, "@capacitor/geolocation": { "version": "4.0.1", @@ -2171,9 +2171,9 @@ "integrity": "sha512-ZLVoLdK1Md/xIRRrDOnrLCKGRg8UENY1ShpKcysPN1z1MgcpvB/9Nbqczm3RH24zyo3MP/7homkqMzUGxPBlwQ==" }, "@capacitor/ios": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-4.1.0.tgz", - "integrity": "sha512-zkv48Xc5QwdL7TIT4YpXwgISrA5Cuy59KyN+uq3ovr+L/y5SgtKAOg7pATRBYT7CFgFLqkey/PQKcTjbcxhyaA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-4.3.0.tgz", + "integrity": "sha512-l9vuFzGkopHEWTsbdCwcJF/TLPspuhWSSq5cfB61YO4HAG5o3y/M6TiftL3JTyw/OOJ6cgWtLI/2QMp1TPIU4w==", "dev": true }, "@capacitor/keyboard": { @@ -2182,9 +2182,9 @@ "integrity": "sha512-JZVci2v9jAKH0sIoNNZzmw/cWGXWf+KneLt0yDr/6YSs/2/tfuH10yOrUOhgrKFkR+fFj/rddTClQXUQ8Rqcrg==" }, "@capacitor/local-notifications": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@capacitor/local-notifications/-/local-notifications-4.0.1.tgz", - "integrity": "sha512-7OX8k1HUKLo5W8LnkHi0Pesshdn2oGbgcw/1cUd37u9hG5S1Y9a0dNjnlYi9BGfV03Bpjxr5P6q1BhKDCwb3wg==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@capacitor/local-notifications/-/local-notifications-4.1.1.tgz", + "integrity": "sha512-0LEHfGO7i5rNNy45Lme10oaqcomi56BvbkEuN/jv7OgXDrJNKoHUgKxadhiXWCnsAq+qmPpsB/01cL1Wo2BUwQ==" }, "@capacitor/network": { "version": "4.0.1", @@ -2202,21 +2202,15 @@ "integrity": "sha512-czqYavgW+rMrlcgZkLHJ4Xwr+7E/T2YxxZ5tVtdqxANlKCw/qUL2tpNx3wphiC8lWj9wLUWFjgrBBDeZSlPYdQ==" }, "@capacitor/splash-screen": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@capacitor/splash-screen/-/splash-screen-4.0.1.tgz", - "integrity": "sha512-7hklUx69aZDonuLP1R5X4ZTGgZLwX8RTj9/3U1905Kz/XflcT7Rhighbad+uZBaOU+L/8Vm6Y3RlR3rFj4ELVA==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@capacitor/splash-screen/-/splash-screen-4.1.0.tgz", + "integrity": "sha512-b+IpnM+dhwHZ7zkXr8M9dgJauwSf8wyOweEkM38EDaw4XhZtZoBjJOby1fAeaxgK4iO2qoej95LgtOjcv6eGkg==" }, "@capacitor/status-bar": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-4.0.1.tgz", "integrity": "sha512-BmEyOf3m/hAf8bO4hCX0m5gpQPSgd05mGYl+9E841WUZeJjcYlmiG/EBshAUb2uGCVtyNaG36yPXB0r0Ypg+rw==" }, - "@capacitor/storage": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@capacitor/storage/-/storage-1.2.5.tgz", - "integrity": "sha512-pWhnw4U7wN/zFV4lA4BLMypSufTktCbk548Yk4whSb0KAq3R0mLfSubRIHkGdcPqQWCsM6g/zUuszurhz6ncWQ==", - "optional": true - }, "@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -2781,9 +2775,9 @@ "integrity": "sha512-hebf0ixGPugiZfH6g7HS/hrDzkKmNdJV/pV2jUz5lfoZXFMjE+7aeAr1AqwW6EGNej65WcEP8VUL5YUc3wSCjw==" }, "@humanwhocodes/config-array": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz", - "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==", + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", + "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==", "requires": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", @@ -2870,11 +2864,11 @@ } }, "@ionic/angular": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.2.4.tgz", - "integrity": "sha512-rHjt5nXA6egZ6cyBA46se3u5O0OYZKtOPrgZR49tpnGcCTEpLSxFpRGjxuKLyAaV6z9fR5krnGRybia+Wt1qbw==", + "version": "6.2.9", + "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.2.9.tgz", + "integrity": "sha512-YWK0Hg99vrp4lRqLFxIYA05ZrHR5zyE7fnpIocQRTZrPsstxpeKd9hoqlQzhfB9CsyTQ8skhMnJVLppKAJxr7A==", "requires": { - "@ionic/core": "^6.2.4", + "@ionic/core": "^6.2.9", "jsonc-parser": "^3.0.0", "tslib": "^2.0.0" } @@ -3015,11 +3009,11 @@ } }, "@ionic/core": { - "version": "6.2.8", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.2.8.tgz", - "integrity": "sha512-tUUdvCPo9Z4RQXjvxNXBXQsVTFDAH2ju/HAhzZiAvdfwpHfpA39DWkXwAQeoV9gfFFblaOmCmeSq/8JP/FRn4A==", + "version": "6.2.9", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.2.9.tgz", + "integrity": "sha512-d2KBXYUKBND2AD8aMgash3O/t04IDc/DHHMshcOydfNJ5qqAxwJYzZR7hs96UknCcIlhHk1pb5C29epkv7gOcQ==", "requires": { - "@stencil/core": "^2.17.4", + "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", "tslib": "^2.1.0" } @@ -3615,21 +3609,21 @@ } }, "@nrwl/cli": { - "version": "14.7.17", - "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-14.7.17.tgz", - "integrity": "sha512-ovzGpWnTrmFXX5TEV2VzBUz8oPLoPkqtGKpdvlHvnd0UADQUpmNxoSY7mzHclDLRMyb6MWnVKqlJiypTG/p9iw==", + "version": "14.8.2", + "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-14.8.2.tgz", + "integrity": "sha512-I+oblryFkZJYk9TMsBWNdN0SV7OjsiD80gD1WjA1KXEQiFVfopYgwErBrxoenodncXrMFRCk/QR9U5F+23+Vow==", "dev": true, "requires": { - "nx": "14.7.17" + "nx": "14.8.2" }, "dependencies": { "@nrwl/tao": { - "version": "14.7.17", - "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-14.7.17.tgz", - "integrity": "sha512-35IPDtv4hdkmDvLuQ/Q5AaDACgsznpmj3+/SitL1U/vYpFUcAPUrPznL3QK4TuvL3IeCLwYaYO0NCZotDEQi4g==", + "version": "14.8.2", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-14.8.2.tgz", + "integrity": "sha512-a4+O307YZJf1H6CDQFGs4DoUvl7xUFSJo2rNHoR9jDlWU+Ug3n0iivX7Fih6Ui0gX4ocEpRwzNMmJhEmEq1BYw==", "dev": true, "requires": { - "nx": "14.7.17" + "nx": "14.8.2" } }, "@zkochan/js-yaml": { @@ -3703,13 +3697,13 @@ } }, "nx": { - "version": "14.7.17", - "resolved": "https://registry.npmjs.org/nx/-/nx-14.7.17.tgz", - "integrity": "sha512-LLXdz4xeR54Lqw9t3XtOJsBtlwtSexrlIwhWc42GKlv4MHrBOnTp99jTQ/hdP9TpGCU7tvShRQ4ildZJapgRSg==", + "version": "14.8.2", + "resolved": "https://registry.npmjs.org/nx/-/nx-14.8.2.tgz", + "integrity": "sha512-pPijBoeybsIlCD8FMH8WTns+pcIL+0ZOh/+otUX2LfVsi+ppH33GUxO9QVLPrLcyGaoHhwil4hYBxPIQ7Z1r2g==", "dev": true, "requires": { - "@nrwl/cli": "14.7.17", - "@nrwl/tao": "14.7.17", + "@nrwl/cli": "14.8.2", + "@nrwl/tao": "14.8.2", "@parcel/watcher": "2.0.4", "@yarnpkg/lockfile": "^1.1.0", "@yarnpkg/parsers": "^3.0.0-rc.18", @@ -5127,9 +5121,9 @@ "dev": true }, "@yarnpkg/parsers": { - "version": "3.0.0-rc.21", - "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.21.tgz", - "integrity": "sha512-aM82UlEU12+grklXCyGnMXMqChrW8BDI6DZuw2JjijLyErEqZ/9MjEyYhcn+oz8bKSvudEAe8ygRzkt1cVMOtQ==", + "version": "3.0.0-rc.22", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.22.tgz", + "integrity": "sha512-GAWDjXduYBUVmOzlj3X0OwTQ1BV4ZeDdgw8yXST3K0lB95drWEGxa1at0v7BmHDyK2y1F1IJufc8N4yrcuXjWg==", "dev": true, "requires": { "js-yaml": "^3.10.0", @@ -6245,9 +6239,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001412", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz", - "integrity": "sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==", + "version": "1.0.30001414", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz", + "integrity": "sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg==", "dev": true }, "capacitor-secure-storage-plugin": { @@ -8041,9 +8035,9 @@ } }, "electron-to-chromium": { - "version": "1.4.265", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.265.tgz", - "integrity": "sha512-38KaYBNs0oCzWCpr6j7fY/W9vF0vSp4tKFIshQTgdZMhUpkxgotkQgjJP6iGMdmlsgMs3i0/Hkko4UXLTrkYVQ==", + "version": "1.4.269", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.269.tgz", + "integrity": "sha512-7mHFONwp7MNvdyto1v70fCwk28NJMFgsK79op+iYHzz1BLE8T66a1B2qW5alb8XgE0yi3FL3ZQjSYZpJpF6snw==", "dev": true }, "elementtree": { @@ -10470,59 +10464,23 @@ "integrity": "sha512-3l3Bymg2eKDsN5wQuMfgGEj2x6l5MCAv0zPL6rxHESufFVlEAKW/6oY9F1aGgvY/EgWm5+eWGRjINveL4X7Hgg==" }, "ionic-appauth": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/ionic-appauth/-/ionic-appauth-0.8.5.tgz", - "integrity": "sha512-4GyFasdqLboGz4mej71UcsSM7XodpFXOcBYdtGvUKJ29p0iIB3/c5BHuGAmpiTqvUfAnGD8insimaQEE3Iensw==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/ionic-appauth/-/ionic-appauth-0.9.0.tgz", + "integrity": "sha512-VayICoCf1MvX3KYOxv4GZ/Z4xNRCEmVzn8NovZVvIfw9BqRYoSIQ3+xP5a+R/PCOhNLMXNr33ygpfsV0OeJSiw==", "requires": { - "@capacitor/browser": "^1.0.2", - "@capacitor/core": "^3.1.2", - "@capacitor/storage": "^1.0.3", - "@ionic-native/core": "^5.34.0", - "@ionic-native/http": "^5.34.0", - "@ionic-native/in-app-browser": "^5.34.0", - "@ionic-native/safari-view-controller": "^5.34.0", - "@ionic-native/secure-storage": "^5.34.0", + "@capacitor/browser": "^4.0.1", + "@capacitor/core": "^4.1.0", + "@capacitor/preferences": "^4.0.1", + "@ionic-native/core": "^5.36.0", + "@ionic-native/http": "^5.36.0", + "@ionic-native/in-app-browser": "^5.36.0", + "@ionic-native/safari-view-controller": "^5.36.0", + "@ionic-native/secure-storage": "^5.36.0", "@ionic/storage": "^3.0.6", "@openid/appauth": "^1.3.1", - "capacitor-secure-storage-plugin": "^0.6.2", + "capacitor-secure-storage-plugin": "^0.8.0", "guid-typescript": "^1.0.9", - "tslib": "^1.9.3" - }, - "dependencies": { - "@capacitor/browser": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@capacitor/browser/-/browser-1.0.7.tgz", - "integrity": "sha512-ni8IjsPyFUYqQ2JxBwzI7VpJUZHPr7QiRds5hQWM/1cpfH0+DWvjWHwzxQXuSbW0h+QGXGSJ/vwqjRns7NzLfQ==", - "optional": true - }, - "@capacitor/core": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.8.0.tgz", - "integrity": "sha512-Z7iHM+1CBbuIK+74bS4ZjpPUOdcKb7Gf7j8xK9WegcrUeHZQl4O6hAAn6nT60kDoeAyutsr3PP25542Ur0wLBg==", - "optional": true, - "requires": { - "tslib": "^2.1.0" - }, - "dependencies": { - "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "optional": true - } - } - }, - "capacitor-secure-storage-plugin": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/capacitor-secure-storage-plugin/-/capacitor-secure-storage-plugin-0.6.4.tgz", - "integrity": "sha512-Uv5uRRiPmvELmtsz89gSt9i/hyliM1H19T3S7ZsUeaxQTiWj1UOzhuADSA1zwTd7tMr8WTHja7Y12uies1hBjw==", - "optional": true - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } + "tslib": "^2.4.0" } }, "ionicons": { @@ -11016,9 +10974,9 @@ "dev": true }, "joi": { - "version": "17.6.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.1.tgz", - "integrity": "sha512-Hl7/iBklIX345OCM1TiFSCZRVaAOLDGlWCp0Df2vWYgBgjkezaR7Kvm3joBciBHQjZj5sxXs859r6eqsRSlG8w==", + "version": "17.6.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.2.tgz", + "integrity": "sha512-+gqqdh1xc1wb+Lor0J9toqgeReyDOCqOdG8QSdRcEvwrcRiFQZneUCGKjFjuyBWUb3uaFOgY56yMaZ5FIc+H4w==", "requires": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", diff --git a/package.json b/package.json index 2390e1a5..42b8bc59 100644 --- a/package.json +++ b/package.json @@ -61,28 +61,28 @@ "@angular/router": "13.3.11", "@asymmetrik/ngx-leaflet": "13.0.2", "@asymmetrik/ngx-leaflet-markercluster": "13.0.1", - "@awesome-cordova-plugins/calendar": "5.44.0", - "@awesome-cordova-plugins/core": "5.44.0", + "@awesome-cordova-plugins/calendar": "5.45.0", + "@awesome-cordova-plugins/core": "5.45.0", "@capacitor-community/http": "1.4.1", "@capacitor/app": "4.0.1", "@capacitor/browser": "4.0.1", - "@capacitor/core": "4.1.0", + "@capacitor/core": "4.3.0", "@capacitor/device": "4.0.1", "@capacitor/dialog": "4.0.1", - "@capacitor/filesystem": "4.1.1", + "@capacitor/filesystem": "4.1.2", "@capacitor/geolocation": "4.0.1", "@capacitor/haptics": "4.0.1", "@capacitor/keyboard": "4.0.1", - "@capacitor/local-notifications": "4.0.1", + "@capacitor/local-notifications": "4.1.1", "@capacitor/network": "4.0.1", "@capacitor/preferences": "4.0.1", "@capacitor/share": "4.0.1", - "@capacitor/splash-screen": "4.0.1", + "@capacitor/splash-screen": "4.1.0", "@capacitor/status-bar": "4.0.1", "@hugotomazi/capacitor-navigation-bar": "2.0.0", "@ionic-native/core": "5.36.0", "@ionic-native/file-opener": "5.36.0", - "@ionic/angular": "6.2.4", + "@ionic/angular": "6.2.9", "@ionic/storage-angular": "3.0.6", "@ngx-translate/core": "14.0.0", "@ngx-translate/http-loader": "7.0.0", @@ -96,7 +96,7 @@ "deepmerge": "4.2.2", "form-data": "4.0.0", "geojson": "0.5.0", - "ionic-appauth": "0.8.5", + "ionic-appauth": "0.9.0", "jsonpath-plus": "6.0.1", "leaflet": "1.8.0", "leaflet.markercluster": "1.5.3", @@ -125,9 +125,9 @@ "@angular/compiler": "13.3.11", "@angular/compiler-cli": "13.3.11", "@angular/language-service": "13.3.11", - "@capacitor/android": "4.1.0", - "@capacitor/cli": "4.1.0", - "@capacitor/ios": "4.1.0", + "@capacitor/android": "4.3.0", + "@capacitor/cli": "4.3.0", + "@capacitor/ios": "4.3.0", "@compodoc/compodoc": "1.1.19", "@cypress/schematic": "1.7.0", "@ionic/angular-toolkit": "6.1.0",