diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 366b979bf..95d768d67 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,35 +1,35 @@ [versions] -kotlin = "1.8.10" -composeUi = "1.3.3" +kotlin = "1.9.0" +composeUi = "1.5.0" composeCompiler = "1.4.2" -coroutines = "1.6.4" -ktor = "2.2.4" -work = "2.8.0" +coroutines = "1.7.3" +ktor = "2.3.3" +work = "2.8.1" [libraries] # algolia -algolia-client = { group = "com.algolia", name = "algoliasearch-client-kotlin", version = "2.1.3" } +algolia-client = { group = "com.algolia", name = "algoliasearch-client-kotlin", version = "2.1.5" } algolia-telemetry = { group = "com.algolia", name = "instantsearch-telemetry", version = "0.2.0" } # network ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" } # kotlin -kotlinx-atomicfu = { group = "org.jetbrains.kotlinx", name = "atomicfu", version = "0.20.0" } +kotlinx-atomicfu = { group = "org.jetbrains.kotlinx", name = "atomicfu", version = "0.22.0" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" } kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } # android androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "composeUi" } -androidx-compose-material = { group = "androidx.compose.material", name = "material", version = "1.3.1" } -androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version = "1.3.1" } -androidx-paging3 = { group = "androidx.paging", name = "paging-runtime", version = "3.1.1" } +androidx-compose-material = { group = "androidx.compose.material", name = "material", version = "1.5.0" } +androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version = "1.5.0" } +androidx-paging3 = { group = "androidx.paging", name = "paging-runtime", version = "3.2.0" } androidx-work = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work" } -androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.9.0" } +androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.10.1" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" } -androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.2.1" } +androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.1" } androidx-swiperefreshlayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version = "1.1.0" } -google-material = { group = "com.google.android.material", name = "material", version = "1.8.0" } +google-material = { group = "com.google.android.material", name = "material", version = "1.9.0" } # test test-androidx-ext = { group = "androidx.test.ext", name = "junit", version = "1.1.5" } @@ -41,17 +41,17 @@ test-ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version. test-kotlin-common = { module = "org.jetbrains.kotlin:kotlin-test-common" } test-kotlin-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common" } test-kotlin-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" } -test-mockk = { group = "io.mockk", name = "mockk", version = "1.13.4" } -test-robolectric = { group = "org.robolectric", name = "robolectric", version = "4.9.2" } -test-turbine = { group = "app.cash.turbine", name = "turbine", version = "0.12.1" } +test-mockk = { group = "io.mockk", name = "mockk", version = "1.13.7" } +test-robolectric = { group = "org.robolectric", name = "robolectric", version = "4.10.3" } +test-turbine = { group = "app.cash.turbine", name = "turbine", version = "1.0.0" } # logging -slf4j = { group = "org.slf4j", name = "slf4j-api", version = "2.0.6" } -logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.5" } +slf4j = { group = "org.slf4j", name = "slf4j-api", version = "2.0.7" } +logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.11" } [plugins] kotlin-multiplaform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -android = { id = "com.android.library", version = "7.4.2" } -maven-publish = { id = "com.vanniktech.maven.publish", version = "0.24.0" } -spotless = { id = "com.diffplug.gradle.spotless", version = "6.16.0" } +android = { id = "com.android.library", version = "8.1.0" } +maven-publish = { id = "com.vanniktech.maven.publish", version = "0.25.3" } +spotless = { id = "com.diffplug.gradle.spotless", version = "6.20.0" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba771..7f93135c4 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 bdc9a83b1..ac72c34e8 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.0.2-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 79a61d421..0adc8e1a5 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,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. @@ -197,6 +198,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