diff --git a/app/build.gradle b/app/build.gradle index a57755c..847d9d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' id 'com.google.gms.google-services' - id 'org.jlleitschuh.gradle.ktlint' version '11.3.1' + id 'org.jlleitschuh.gradle.ktlint' version '11.5.1' id 'kotlin-kapt' id 'com.google.dagger.hilt.android' } @@ -76,19 +76,19 @@ ktlint { } dependencies { - ktlintRuleset "io.nlopez.compose.rules:ktlint:0.1.5" + ktlintRuleset "io.nlopez.compose.rules:ktlint:0.2.1" - def composeBom = platform('androidx.compose:compose-bom:2023.04.01') + def composeBom = platform('androidx.compose:compose-bom:2023.08.00') implementation composeBom - implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - implementation 'androidx.activity:activity-compose:1.7.1' + implementation 'androidx.activity:activity-compose:1.7.2' implementation "androidx.compose.ui:ui" implementation "androidx.compose.ui:ui-tooling-preview" implementation "androidx.compose.material:material" implementation "androidx.compose.runtime:runtime-livedata" - implementation platform('com.google.firebase:firebase-bom:31.5.0') + implementation platform('com.google.firebase:firebase-bom:32.2.2') implementation "androidx.navigation:navigation-compose:$navigationVersion" implementation 'androidx.hilt:hilt-navigation-compose:1.0.0' implementation "com.google.dagger:hilt-android:$hiltVersion" diff --git a/app/testing/build.gradle b/app/testing/build.gradle index 33e0776..b2e6081 100644 --- a/app/testing/build.gradle +++ b/app/testing/build.gradle @@ -32,9 +32,9 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.9.0' implementation project(path: ':app') testImplementation 'junit:junit:4.13.2' diff --git a/build.gradle b/build.gradle index 61164d5..f530dca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ buildscript { ext { - jUnitVersion = '5.9.2' - navigationVersion = '2.5.3' - hiltVersion = '2.45' - roomVersion = '2.5.1' + jUnitVersion = '5.10.0' + navigationVersion = '2.7.0' + hiltVersion = '2.47' + roomVersion = '2.5.2' } dependencies { @@ -12,8 +12,8 @@ buildscript { }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.0' apply false - id 'com.android.library' version '8.0.0' apply false + id 'com.android.application' version '8.1.0' apply false + id 'com.android.library' version '8.1.0' apply false id 'org.jetbrains.kotlin.android' version '1.8.20' apply false id 'com.google.dagger.hilt.android' version "$hiltVersion" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..7f93135 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 37aef8d..ac72c34 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-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..0adc8e1 100644 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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 # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,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.