diff --git a/.editorconfig b/.editorconfig index 536d4c97..7631ddac 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,8 +12,8 @@ indent_size = 4 # ktlint configuration ktlint_code_style = android ktlint_experimental = enabled -ktlint_experimental_function-naming = disabled -ktlint_experimental_property-naming = disabled +ktlint_standard_function-naming = disabled +ktlint_standard_property-naming = disabled ij_kotlin_allow_trailing_comma = true ij_kotlin_allow_trailing_comma_on_call_site = true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 83b84f99..92d91f6a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] android-gradle-plugin = "8.0.2" androidx-activity = "1.7.2" -androidx-compose-bom = "2023.05.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping -androidx-compose-compiler = "1.4.7" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility +androidx-compose-bom = "2023.06.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping +androidx-compose-compiler = "1.4.8" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility androidx-lifecycle = "2.6.1" google-accompanist = "0.30.1" kotest = "5.6.2" -kotlin = "1.8.21" -kotlinx-coroutines = "1.7.1" -mikepenz-aboutlibraries = "10.7.0" +kotlin = "1.8.22" +kotlinx-coroutines = "1.7.2" +mikepenz-aboutlibraries = "10.8.0" [libraries] android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" } @@ -29,7 +29,7 @@ androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-ru androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } -androidx-navigation-compose = "androidx.navigation:navigation-compose:2.5.3" +androidx-navigation-compose = "androidx.navigation:navigation-compose:2.6.0" androidx-startup-runtime = "androidx.startup:startup-runtime:1.1.1" facebook-stetho = "com.facebook.stetho:stetho:1.6.0" google-accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "google-accompanist" } @@ -57,6 +57,6 @@ androidx-compose = [ [plugins] adarshr-test-logger = "com.adarshr.test-logger:3.2.0" -ben-manes-versions = "com.github.ben-manes.versions:0.46.0" -kotlinter = "org.jmailen.kotlinter:3.14.0" -triplet-play = "com.github.triplet.play:3.8.3" +ben-manes-versions = "com.github.ben-manes.versions:0.47.0" +kotlinter = "org.jmailen.kotlinter:3.15.0" +triplet-play = "com.github.triplet.play:3.8.4" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba77..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 6ad941a0..b7009913 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -17,7 +17,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.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d42..aeb74cbb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,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