Skip to content

Commit b0c152f

Browse files
authored
Merge pull request #40 from android/renovate/end-all
Update all dependencies (end)
2 parents bd1be16 + d5ef72f commit b0c152f

File tree

12 files changed

+38
-40
lines changed

12 files changed

+38
-40
lines changed

baseline-profiles/gradle/libs.versions.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[versions]
22
accompanist = "0.36.0"
3-
androidGradlePlugin = "8.7.3"
4-
androidx-activity-compose = "1.9.3"
3+
androidGradlePlugin = "8.10.1"
4+
androidx-activity-compose = "1.10.1"
55
androidx-benchmark-junit4 = "1.4.0-beta02"
6-
androidx-compose-bom = "2024.12.01"
7-
androidx-constraintlayout = "1.1.0"
8-
androidx-corektx = "1.15.0"
9-
androidx-lifecycle-compose = "2.8.7"
10-
androidx-lifecycle-runtime-compose = "2.8.7"
11-
androidx-navigation = "2.8.5"
6+
androidx-compose-bom = "2025.06.00"
7+
androidx-constraintlayout = "1.1.1"
8+
androidx-corektx = "1.16.0"
9+
androidx-lifecycle-compose = "2.9.1"
10+
androidx-lifecycle-runtime-compose = "2.9.1"
11+
androidx-navigation = "2.9.0"
1212
androidx-test = "1.6.1"
1313
androidx-test-espresso = "3.6.1"
1414
androidx-test-ext-junit = "1.2.1"
1515
androix-test-uiautomator = "2.3.0"
1616
coil = "2.7.0"
17-
coroutines = "1.9.0"
17+
coroutines = "1.10.2"
1818
junit = "4.13.2"
19-
kotlin = "2.1.0"
20-
runtimeTracing = "1.7.6"
19+
kotlin = "2.1.21"
20+
runtimeTracing = "1.8.2"
2121
profileinstaller = "1.4.1"
2222
baselineprofile = "1.3.4"
2323

baseline-profiles/gradle/spotless.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
val ktlintVersion = "0.43.0"
1818

1919
initscript {
20-
val spotlessVersion = "6.25.0"
20+
val spotlessVersion = "7.0.4"
2121

2222
repositories {
2323
mavenCentral()
181 Bytes
Binary file not shown.

baseline-profiles/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

baseline-profiles/gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

baseline-profiles/gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

benchmarking/gradle/libs.versions.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[versions]
22
accompanist = "0.36.0"
3-
androidGradlePlugin = "8.7.3"
4-
androidx-activity-compose = "1.9.3"
3+
androidGradlePlugin = "8.10.1"
4+
androidx-activity-compose = "1.10.1"
55
androidx-benchmark-junit4 = "1.4.0-beta02"
6-
androidx-compose-bom = "2024.12.01"
7-
androidx-constraintlayout = "1.1.0"
8-
androidx-corektx = "1.15.0"
9-
androidx-lifecycle-compose = "2.8.7"
10-
androidx-lifecycle-runtime-compose = "2.8.7"
11-
androidx-navigation = "2.8.5"
6+
androidx-compose-bom = "2025.06.00"
7+
androidx-constraintlayout = "1.1.1"
8+
androidx-corektx = "1.16.0"
9+
androidx-lifecycle-compose = "2.9.1"
10+
androidx-lifecycle-runtime-compose = "2.9.1"
11+
androidx-navigation = "2.9.0"
1212
androidx-test = "1.6.1"
1313
androidx-test-espresso = "3.6.1"
1414
androidx-test-ext-junit = "1.2.1"
1515
androix-test-uiautomator = "2.3.0"
1616
coil = "2.7.0"
17-
coroutines = "1.9.0"
17+
coroutines = "1.10.2"
1818
junit = "4.13.2"
19-
kotlin = "2.1.0"
20-
runtimeTracing = "1.7.6"
19+
kotlin = "2.1.21"
20+
runtimeTracing = "1.8.2"
2121
profileinstaller = "1.4.1"
2222

2323
[libraries]

benchmarking/gradle/spotless.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
val ktlintVersion = "0.43.0"
1818

1919
initscript {
20-
val spotlessVersion = "6.25.0"
20+
val spotlessVersion = "7.0.4"
2121

2222
repositories {
2323
mavenCentral()
181 Bytes
Binary file not shown.

benchmarking/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

benchmarking/gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

benchmarking/gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)