From b268cf06e544c8041924a6234dee581a1775a513 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 11:26:41 +0000 Subject: [PATCH 1/2] Update all dependencies --- build.gradle.kts | 8 ++++---- composesensors/build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 14 +++++++------- sample/build.gradle.kts | 10 +++++----- wearablesample/build.gradle.kts | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 46a9c44..fb7e532 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ buildscript { - val compose_version by extra("1.5.0") - val wear_compose_version by extra("1.2.0") + val compose_version by extra("1.5.4") + val wear_compose_version by extra("1.2.1") } // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.1.1" apply false - id("com.android.library") version "8.1.1" apply false + id("com.android.application") version "8.1.2" apply false + id("com.android.library") version "8.1.2" apply false id("org.jetbrains.kotlin.android") version "1.9.10" apply false } diff --git a/composesensors/build.gradle.kts b/composesensors/build.gradle.kts index fe0fd56..a053a45 100644 --- a/composesensors/build.gradle.kts +++ b/composesensors/build.gradle.kts @@ -40,13 +40,13 @@ android { } dependencies { - val coreKtxVersion = "1.10.1" + val coreKtxVersion = "1.12.0" val appCompatVersion = "1.6.1" - val materialVersion = "1.9.0" + val materialVersion = "1.10.0" val jUnitVersion = "4.13.2" val androidJUnitVersion = "1.1.5" val espressoVersion = "3.5.1" - val composeVersion = "1.5.0" + val composeVersion = "1.5.4" implementation("androidx.compose.runtime:runtime:$composeVersion") implementation("androidx.compose.ui:ui:$composeVersion") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34..3fa8f86 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ 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 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ 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 -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index c9fc454..cf89efa 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -71,11 +71,11 @@ android { } dependencies { - val composeVersion = "1.5.0" - val material3Version = "1.1.1" - val lifecycleRuntimeKtxVersion = "2.6.1" - val coreKtxVersion = "1.10.1" - val activityComposeVersion = "1.7.2" + val composeVersion = "1.5.4" + val material3Version = "1.1.2" + val lifecycleRuntimeKtxVersion = "2.6.2" + val coreKtxVersion = "1.12.0" + val activityComposeVersion = "1.8.0" val jUnitVersion = "4.13.2" val androidJUnitVersion = "1.1.5" val espressoVersion = "3.5.1" diff --git a/wearablesample/build.gradle.kts b/wearablesample/build.gradle.kts index 65d3c4e..0054b3c 100644 --- a/wearablesample/build.gradle.kts +++ b/wearablesample/build.gradle.kts @@ -70,7 +70,7 @@ android { dependencies { implementation(project(mapOf("path" to ":composesensors"))) - implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.core:core-ktx:1.12.0") implementation("com.google.android.gms:play-services-wearable:18.1.0") implementation("androidx.percentlayout:percentlayout:1.0.0") implementation("androidx.legacy:legacy-support-v4:1.0.0") @@ -78,8 +78,8 @@ dependencies { implementation("androidx.wear.compose:compose-material:${rootProject.extra["wear_compose_version"]}") implementation("androidx.wear.compose:compose-foundation:${rootProject.extra["wear_compose_version"]}") implementation("androidx.compose.ui:ui-tooling-preview:${rootProject.extra["compose_version"]}") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") - implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.activity:activity-compose:1.8.0") androidTestImplementation("androidx.compose.ui:ui-test-junit4:${rootProject.extra["compose_version"]}") debugImplementation("androidx.compose.ui:ui-tooling:${rootProject.extra["compose_version"]}") debugImplementation("androidx.compose.ui:ui-test-manifest:${rootProject.extra["compose_version"]}") From 7b20d5bc338e0e501dcf347635bb004c9eec9243 Mon Sep 17 00:00:00 2001 From: Shubham Singh Date: Wed, 25 Oct 2023 17:00:32 +0530 Subject: [PATCH 2/2] Fix ktlint errors --- sample/build.gradle.kts | 3 +-- wearablesample/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index cf89efa..77db15d 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -27,7 +27,7 @@ android { if (propertiesFile.exists()) { create("release") { // Load keystore - val keystoreProperties = Properties().apply{ + val keystoreProperties = Properties().apply { load(propertiesFile.reader()) } storeFile = File(keystoreProperties.getProperty("storeFile")) @@ -47,7 +47,6 @@ android { ) runCatching { signingConfigs.getByName("release") } .onSuccess { safeConfig -> signingConfig = safeConfig } - } } compileOptions { diff --git a/wearablesample/build.gradle.kts b/wearablesample/build.gradle.kts index 0054b3c..d102a63 100644 --- a/wearablesample/build.gradle.kts +++ b/wearablesample/build.gradle.kts @@ -25,7 +25,7 @@ android { if (propertiesFile.exists()) { create("release") { // Load keystore - val keystoreProperties = Properties().apply{ + val keystoreProperties = Properties().apply { load(propertiesFile.reader()) } storeFile = File(keystoreProperties.getProperty("storeFile"))