diff --git a/.github/workflows/lotonaticos.yml b/.github/workflows/lotonaticos.yml index 599a982..331ec63 100644 --- a/.github/workflows/lotonaticos.yml +++ b/.github/workflows/lotonaticos.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cancel Stale Jobs - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@0.12.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -26,18 +26,18 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} @@ -66,7 +66,7 @@ jobs: run: ./gradlew lint - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1745cc4..875fa4d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,7 +7,7 @@ plugins { id("kotlinx-serialization") id("org.jetbrains.kotlin.android") id("com.google.firebase.crashlytics") - id("org.sonarqube") version "3.4.0.2513" + id("org.sonarqube") version "5.1.0.4882" id("com.victorhvs.kotlin-quality") } diff --git a/build.gradle.kts b/build.gradle.kts index 410985c..b3f8eea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,13 +5,13 @@ buildscript { maven(url = "https://jitpack.io") } dependencies { - classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") - classpath("com.google.dagger:hilt-android-gradle-plugin:2.44.2") - classpath("org.jetbrains.kotlin:kotlin-serialization:1.7.10") - classpath("com.google.gms:google-services:4.3.14") - classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2") - classpath("org.jacoco:org.jacoco.core:0.8.8") + classpath("com.android.tools.build:gradle:8.7.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20") + classpath("com.google.dagger:hilt-android-gradle-plugin:2.52") + classpath("org.jetbrains.kotlin:kotlin-serialization:2.0.20") + classpath("com.google.gms:google-services:4.4.2") + classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.2") + classpath("org.jacoco:org.jacoco.core:0.8.12") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f2eadcc..8d775f0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,49 +1,49 @@ [versions] # plugins -androidGradle = "7.3.1" -detekt = "1.22.0" -sonarqube = "3.2.0" -ktlint = "0.47.1" +androidGradle = "8.7.0" +detekt = "1.23.7" +sonarqube = "3.3" +ktlint = "0.51.0-FINAL" junit = "4.13.2" -ksp = "1.7.21-1.0.8" -firebaseCrashlyticsPlugin = "2.9.2" -googleServices = "4.3.14" +ksp = "2.0.20-1.0.25" +firebaseCrashlyticsPlugin = "3.0.2" +googleServices = "4.4.2" # production libraries -coreKtx = "1.9.0" -appCompat = "1.5.1" -lifecycleRuntime = "2.5.1" -coil = "2.2.2" +coreKtx = "1.13.1" +appCompat = "1.7.0" +lifecycleRuntime = "2.8.6" +coil = "2.7.0" compose = "1.3.1" -composeAccompanist = "0.27.1" +composeAccompanist = "0.36.0" composeCompiler = "1.3.0" -composeNavigation = "2.5.3" -composeNavigationHilt = "1.0.0" -composeActivity = "1.6.1" -composePaging = "1.0.0-alpha17" +composeNavigation = "2.8.2" +composeNavigationHilt = "1.2.0" +composeActivity = "1.9.2" +composePaging = "3.3.2" composeSwipeRefresh = "0.24.0-alpha" composeMaterial3 = "1.0.1" -desugar = "1.1.6" -hilt = "2.44.2" -kotlin = "1.7.20" -kotlinCoroutines = "1.6.4" -kotlinSerialization = "1.4.1" -kotlinSerializationConverter = "0.8.0" -kotlinCoroutinePlayServices = "1.6.4" -lifecycle = "2.5.1" +desugar = "2.1.2" +hilt = "2.52" +kotlin = "2.0.20" +kotlinCoroutines = "1.9.0" +kotlinSerialization = "1.7.3" +kotlinSerializationConverter = "1.0.0" +kotlinCoroutinePlayServices = "1.9.0" +lifecycle = "2.8.6" -firebaseBoM = "30.5.0" -appCheckDebug = "16.1.0" +firebaseBoM = "33.4.0" +appCheckDebug = "18.0.0" # test libraries testJunit = "5.9.0" -testMockk = "1.13.2" +testMockk = "1.13.12" testTurbine = "0.9.0" -testKotest = "5.5.4" +testKotest = "5.9.1" # android test libraries -testAndroidJunitExt = "1.1.4" # to prevent manifest crashes in UI tests for Android 12 (1.1.3 or higher needed) -testAndroidRunner = "1.5.1" +testAndroidJunitExt = "1.2.1" # to prevent manifest crashes in UI tests for Android 12 (1.1.3 or higher needed) +testAndroidRunner = "1.6.2" [plugins] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..a4b76b9 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 f398c33..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # 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 +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,10 +85,9 @@ done # 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +134,13 @@ 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. + 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. @@ -144,7 +148,7 @@ 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 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then 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. + +# 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" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/scripts/budget-alert/requirements.txt b/scripts/budget-alert/requirements.txt index 9d82c93..7bcd6a1 100644 --- a/scripts/budget-alert/requirements.txt +++ b/scripts/budget-alert/requirements.txt @@ -1 +1 @@ -google-api-python-client==2.66.0 +google-api-python-client==2.148.0 diff --git a/scripts/crawler/requirements.txt b/scripts/crawler/requirements.txt index f779bef..7659399 100644 --- a/scripts/crawler/requirements.txt +++ b/scripts/crawler/requirements.txt @@ -1,3 +1,3 @@ requests==2.31.0 -firebase-admin==5.4.0 -requests_toolbelt==0.10.1 \ No newline at end of file +firebase-admin==6.5.0 +requests_toolbelt==1.0.0 \ No newline at end of file diff --git a/scripts/requirements.txt b/scripts/requirements.txt index faa8307..00cc907 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -1,4 +1,4 @@ -mock==4.0.3 -pytest==7.2.0 -jupyter==1.0.0 -google-api-python-client==2.66.0 \ No newline at end of file +mock==5.1.0 +pytest==8.3.3 +jupyter==1.1.1 +google-api-python-client==2.148.0 \ No newline at end of file diff --git a/scripts/seeders/requirements.txt b/scripts/seeders/requirements.txt index f779bef..7659399 100644 --- a/scripts/seeders/requirements.txt +++ b/scripts/seeders/requirements.txt @@ -1,3 +1,3 @@ requests==2.31.0 -firebase-admin==5.4.0 -requests_toolbelt==0.10.1 \ No newline at end of file +firebase-admin==6.5.0 +requests_toolbelt==1.0.0 \ No newline at end of file