diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6674d50..4136ba6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("com.google.devtools.ksp") version "1.9.23-1.0.20" + id("com.google.devtools.ksp") version "1.9.25-1.0.20" id("androidx.navigation.safeargs.kotlin") - kotlin("plugin.serialization") version "1.9.23" + kotlin("plugin.serialization") version "1.9.25" id("org.jmailen.kotlinter") id("io.gitlab.arturbosch.detekt") } @@ -119,11 +119,11 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.11.0") - implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")?.version?.also { + implementation("androidx.core:core-ktx:1.15.0") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.12.0") + implementation("androidx.constraintlayout:constraintlayout:2.2.0") + implementation("androidx.navigation:navigation-fragment-ktx:2.8.4")?.version?.also { implementation("androidx.navigation:navigation-ui-ktx:$it") androidTestImplementation("androidx.navigation:navigation-testing:$it") } @@ -132,17 +132,17 @@ dependencies { implementation("com.android.support:support-annotations:28.0.0") val room = implementation("androidx.room:room-ktx:2.6.1") ksp("androidx.room:room-compiler:${room?.version}") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")?.also { + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")?.also { implementation("androidx.lifecycle:lifecycle-livedata-ktx:${it.version}") } - implementation("androidx.activity:activity-ktx:1.8.2") - implementation("androidx.fragment:fragment-ktx:1.6.2") - implementation("androidx.work:work-runtime-ktx:2.9.0")?.version?.also { + implementation("androidx.activity:activity-ktx:1.9.3") + implementation("androidx.fragment:fragment-ktx:1.8.5") + implementation("androidx.work:work-runtime-ktx:2.10.0")?.version?.also { androidTestImplementation("androidx.work:work-testing:$it") } - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")?.version?.also { + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")?.version?.also { implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:$it") } @@ -157,18 +157,18 @@ dependencies { } testImplementation("junit:junit:4.13.2") - testImplementation("io.kotest:kotest-runner-junit5:5.8.1")?.version?.also { + testImplementation("io.kotest:kotest-runner-junit5:5.9.1")?.version?.also { testImplementation("io.kotest:kotest-assertions-core:$it")?.also { dep -> androidTestImplementation(dep) } testImplementation("io.kotest:kotest-property:$it") } - testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1") - testImplementation("org.robolectric:robolectric:4.12.1") - androidTestImplementation("androidx.test.ext:junit-ktx:1.1.5") - androidTestImplementation("androidx.test:rules:1.5.0") - androidTestImplementation("androidx.test:runner:1.5.2") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")?.version?.also { + testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0") + testImplementation("org.robolectric:robolectric:4.14.1") + androidTestImplementation("androidx.test.ext:junit-ktx:1.2.1") + androidTestImplementation("androidx.test:rules:1.6.1") + androidTestImplementation("androidx.test:runner:1.6.2") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")?.version?.also { implementation("androidx.test.espresso:espresso-idling-resource:$it") androidTestImplementation("androidx.test.espresso:espresso-contrib:$it") } diff --git a/build.gradle.kts b/build.gradle.kts index a81725b..2e12376 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,32 +4,32 @@ buildscript { google() } dependencies { - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7") + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.8.4") } configurations.classpath { resolutionStrategy { force( - "com.pinterest.ktlint:ktlint-rule-engine:1.2.1", - "com.pinterest.ktlint:ktlint-rule-engine-core:1.2.1", - "com.pinterest.ktlint:ktlint-cli-reporter-core:1.2.1", - "com.pinterest.ktlint:ktlint-cli-reporter-checkstyle:1.2.1", - "com.pinterest.ktlint:ktlint-cli-reporter-json:1.2.1", - "com.pinterest.ktlint:ktlint-cli-reporter-html:1.2.1", - "com.pinterest.ktlint:ktlint-cli-reporter-plain:1.2.1", - "com.pinterest.ktlint:ktlint-cli-reporter-sarif:1.2.1", - "com.pinterest.ktlint:ktlint-ruleset-standard:1.2.1" + "com.pinterest.ktlint:ktlint-rule-engine:1.4.1", + "com.pinterest.ktlint:ktlint-rule-engine-core:1.4.1", + "com.pinterest.ktlint:ktlint-cli-reporter-core:1.4.1", + "com.pinterest.ktlint:ktlint-cli-reporter-checkstyle:1.4.1", + "com.pinterest.ktlint:ktlint-cli-reporter-json:1.4.1", + "com.pinterest.ktlint:ktlint-cli-reporter-html:1.4.1", + "com.pinterest.ktlint:ktlint-cli-reporter-plain:1.4.1", + "com.pinterest.ktlint:ktlint-cli-reporter-sarif:1.4.1", + "com.pinterest.ktlint:ktlint-ruleset-standard:1.4.1" ) } } } plugins { - id("com.android.application") version "8.3.2" apply false - id("com.android.library") version "8.3.2" apply false - id("org.jetbrains.kotlin.android") version "1.9.23" apply false - id("org.jmailen.kotlinter") version "4.3.0" apply false - id("io.gitlab.arturbosch.detekt") version "1.23.6" apply false + id("com.android.application") version "8.7.2" apply false + id("com.android.library") version "8.7.2" apply false + id("org.jetbrains.kotlin.android") version "1.9.25" apply false + id("org.jmailen.kotlinter") version "4.5.0" apply false + id("io.gitlab.arturbosch.detekt") version "1.23.7" apply false // Related: https://github.com/NeoTech-Software/Android-Root-Coverage-Plugin?tab=readme-ov-file#4-compatibility - id("nl.neotech.plugin.rootcoverage") version "1.8.0" + id("nl.neotech.plugin.rootcoverage") version "1.9.0" } tasks.create("clean") { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..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 b82aa23..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..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/. @@ -84,7 +86,8 @@ done # 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 +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 diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..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 ##########################################################################