diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9dfd9bd..40fa5fe4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,8 @@ jobs: distribution: 'adopt' cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 - name: Run unit tests run: ./gradlew testDebugUnitTest diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1133aa37..e51f7dd8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,7 +7,7 @@ plugins { id("kotlin-parcelize") id("androidx.navigation.safeargs.kotlin") id("com.squareup.sqldelight") - id("com.google.devtools.ksp") version "1.6.21-1.0.5" + id("com.google.devtools.ksp") version "1.8.20-1.0.10" } val signingPropertiesFile = rootProject.file("signing.properties") @@ -98,7 +98,7 @@ dependencies { testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVer") // KTX extensions provide concise, idiomatic Kotlin to Jetpack, Android platform, and other APIs - implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.core:core-ktx:1.10.0") val fragmentVer = "1.4.1" implementation("androidx.fragment:fragment-ktx:$fragmentVer") @@ -116,7 +116,7 @@ dependencies { androidTestImplementation("androidx.work:work-testing:$workVer") // In-app browser, it's about 2x faster than calling an external browser - implementation("androidx.browser:browser:1.4.0") + implementation("androidx.browser:browser:1.5.0") // Provides lifecycle-aware coroutine scopes val lifecycleVer = "2.5.1" @@ -127,7 +127,7 @@ dependencies { implementation("androidx.constraintlayout:constraintlayout:2.1.4") // List widget - implementation("androidx.recyclerview:recyclerview:1.2.1") + implementation("androidx.recyclerview:recyclerview:1.3.0") // Enables swipe to refresh pattern implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") @@ -158,7 +158,7 @@ dependencies { ksp("io.insert-koin:koin-ksp-compiler:$koinAnnotationsVer") // Material design components - implementation("com.google.android.material:material:1.7.0") + implementation("com.google.android.material:material:1.8.0") // Used to download, cache and display images implementation("com.squareup.picasso:picasso:2.71828") @@ -186,8 +186,8 @@ dependencies { androidTestImplementation("junit:junit:4.13.2") // An instrumentation that runs various types of test cases - androidTestImplementation("androidx.test:runner:1.4.0") + androidTestImplementation("androidx.test:runner:1.5.2") // UI testing framework - androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") } diff --git a/build.gradle.kts b/build.gradle.kts index 206cf20f..fbf9c2c7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,8 +6,8 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:7.3.1") - classpath(kotlin("gradle-plugin", version = "1.6.21")) - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2") + classpath(kotlin("gradle-plugin", version = "1.8.20")) + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3") classpath("com.squareup.sqldelight:gradle-plugin:1.5.4") } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a..c1962a79 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 aa991fce..0c85a1f7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..aeb74cbb 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,13 +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##*/} - -# 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,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 @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal 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% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :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