Skip to content

Commit

Permalink
Merge pull request #117 from mutualmobile/renovate/all
Browse files Browse the repository at this point in the history
Update all dependencies
  • Loading branch information
shubhamsinghmutualmobile authored Oct 25, 2023
2 parents bf7398c + 7b20d5b commit d7122f6
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 26 deletions.
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
}
6 changes: 3 additions & 3 deletions composesensors/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 7 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ 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
case $MAX_FD in #(
'' | 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
Expand Down Expand Up @@ -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" \
Expand Down
13 changes: 6 additions & 7 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -47,7 +47,6 @@ android {
)
runCatching { signingConfigs.getByName("release") }
.onSuccess { safeConfig -> signingConfig = safeConfig }

}
}
compileOptions {
Expand All @@ -71,11 +70,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"
Expand Down
8 changes: 4 additions & 4 deletions wearablesample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -70,16 +70,16 @@ 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")
implementation("androidx.compose.ui:ui:${rootProject.extra["compose_version"]}")
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"]}")
Expand Down

0 comments on commit d7122f6

Please sign in to comment.