diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b921102..ca30cb6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -49,23 +49,23 @@ dependencies { implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs"))) implementation("androidx.core:core-ktx:1.9.0") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10") - implementation("androidx.exifinterface:exifinterface:1.3.5") + implementation("androidx.exifinterface:exifinterface:1.3.6") testImplementation("junit:junit:4.13.2") - implementation("androidx.appcompat:appcompat:1.5.1") - implementation("androidx.fragment:fragment-ktx:1.5.4") - implementation("com.google.android.material:material:1.6.1") - implementation("com.google.zxing:core:3.5.0") + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("androidx.fragment:fragment-ktx:1.5.5") + implementation("com.google.android.material:material:1.8.0") + implementation("com.google.zxing:core:3.5.1") implementation("com.github.ctodobom:OpenCV-3.1.0-Android:9e00ee4218ca0c9e60a905c9f09bf499f9dc5115") implementation("us.feras.mdv:markdownview:1.1.0") implementation("com.github.ctodobom:drag-select-recyclerview:0.3.4.ctodobom.sections") implementation("com.github.allgood:Android-Universal-Image-Loader:717a00c") implementation("com.github.ctodobom:FabToolbar:3c5f0e0ff1b6d5089e20b7da7157a604075ae943") implementation("com.github.matomo-org:matomo-sdk-android:4.1.4") - implementation("com.github.MikeOrtiz:TouchImageView:3.2.1") + implementation("com.github.MikeOrtiz:TouchImageView:3.3") - val itextpdf_version = "7.2.4" + val itextpdf_version = "7.2.5" implementation("com.itextpdf:kernel:$itextpdf_version") implementation("com.itextpdf:layout:$itextpdf_version") implementation("com.itextpdf:io:$itextpdf_version") diff --git a/build.gradle.kts b/build.gradle.kts index 4da2885..4cee2a4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,8 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") + classpath("com.android.tools.build:gradle:7.4.2") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..ccebba7 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 f7189a7..a2efda8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..79a61d4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # 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 +# 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/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # 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"' @@ -143,12 +143,16 @@ 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=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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME%