Skip to content

Commit 60e06cd

Browse files
bentrengrovebentrengrove
authored
Merge pull request #474 from android/renovate/main-all
Update all dependencies (main)
2 parents 20410d8 + 1e54aad commit 60e06cd

File tree

91 files changed

+504
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+504
-371
lines changed

‎.github/workflows/AccessibilityCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
distribution: 'zulu'
3535
java-version: 17
3636

37-
- uses: gradle/actions/setup-gradle@v3
37+
- uses: gradle/actions/setup-gradle@v4
3838

3939
- name: Build project
4040
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
distribution: 'zulu'
3434
java-version: 17
3535

36-
- uses: gradle/actions/setup-gradle@v3
36+
- uses: gradle/actions/setup-gradle@v4
3737

3838
- name: Build project
3939
working-directory: ${{ env.SAMPLE_PATH }}
@@ -81,7 +81,7 @@ jobs:
8181
distribution: 'zulu'
8282
java-version: 17
8383

84-
- uses: gradle/actions/setup-gradle@v3
84+
- uses: gradle/actions/setup-gradle@v4
8585

8686
- name: Run instrumentation tests
8787
uses: reactivecircus/android-emulator-runner@v2

‎.github/workflows/AnimationCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
distribution: 'zulu'
3434
java-version: 17
3535

36-
- uses: gradle/actions/setup-gradle@v3
36+
- uses: gradle/actions/setup-gradle@v4
3737

3838
- name: Build project
3939
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/BasicLayoutsCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
distribution: 'zulu'
3434
java-version: 17
3535

36-
- uses: gradle/actions/setup-gradle@v3
36+
- uses: gradle/actions/setup-gradle@v4
3737

3838
- name: Build project
3939
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/BasicStateCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
distribution: 'zulu'
3434
java-version: 17
3535

36-
- uses: gradle/actions/setup-gradle@v3
36+
- uses: gradle/actions/setup-gradle@v4
3737

3838
- name: Build project
3939
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/BasicsCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
distribution: 'zulu'
3434
java-version: 17
3535

36-
- uses: gradle/actions/setup-gradle@v3
36+
- uses: gradle/actions/setup-gradle@v4
3737

3838
- name: Build project
3939
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/MigrationCodelab.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
distribution: 'zulu'
3434
java-version: 17
3535

36-
- uses: gradle/actions/setup-gradle@v3
36+
- uses: gradle/actions/setup-gradle@v4
3737

3838
- name: Build project
3939
working-directory: ${{ env.SAMPLE_PATH }}
@@ -81,7 +81,7 @@ jobs:
8181
distribution: 'zulu'
8282
java-version: 17
8383

84-
- uses: gradle/actions/setup-gradle@v3
84+
- uses: gradle/actions/setup-gradle@v4
8585

8686
- name: Run instrumentation tests
8787
uses: reactivecircus/android-emulator-runner@v2

‎.github/workflows/NavigationCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
distribution: 'zulu'
3535
java-version: 17
3636

37-
- uses: gradle/actions/setup-gradle@v3
37+
- uses: gradle/actions/setup-gradle@v4
3838

3939
- name: Build project
4040
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/TestingCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
distribution: 'zulu'
3535
java-version: 17
3636

37-
- uses: gradle/actions/setup-gradle@v3
37+
- uses: gradle/actions/setup-gradle@v4
3838

3939
- name: Build project
4040
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/ThemingCodelab.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
distribution: 'zulu'
3434
java-version: 17
3535

36-
- uses: gradle/actions/setup-gradle@v3
36+
- uses: gradle/actions/setup-gradle@v4
3737

3838
- name: Build project
3939
working-directory: ${{ env.SAMPLE_PATH }}

‎AccessibilityCodelab/app/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ android {
8787
}
8888

8989
dependencies {
90-
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
90+
def composeBom = platform('androidx.compose:compose-bom:2024.09.00')
9191
implementation(composeBom)
9292
testImplementation(composeBom)
9393
androidTestImplementation(composeBom)
@@ -107,30 +107,30 @@ dependencies {
107107
androidTestImplementation "androidx.compose.ui:ui-test"
108108
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
109109

110-
def accompanist_version = '0.34.0'
110+
def accompanist_version = '0.36.0'
111111
implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version"
112112
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
113113

114114
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
115115

116116
implementation 'androidx.appcompat:appcompat:1.7.0'
117-
implementation 'androidx.activity:activity-ktx:1.9.0'
117+
implementation 'androidx.activity:activity-ktx:1.9.2'
118118
implementation 'androidx.core:core-ktx:1.13.1'
119-
implementation "androidx.activity:activity-compose:1.9.0"
119+
implementation "androidx.activity:activity-compose:1.9.2"
120120

121-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
122-
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2"
123-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
124-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2"
121+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5"
122+
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.5"
123+
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.5"
124+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5"
125125

126-
implementation 'androidx.navigation:navigation-compose:2.7.7'
126+
implementation 'androidx.navigation:navigation-compose:2.8.0'
127127

128-
androidTestImplementation 'androidx.test:rules:1.6.0'
129-
androidTestImplementation 'androidx.test:runner:1.6.0'
128+
androidTestImplementation 'androidx.test:rules:1.6.1'
129+
androidTestImplementation 'androidx.test:runner:1.6.2'
130130

131131
// TODO: Bump to latest after Espresso 3.5.0 goes stable
132132
// (due to https://github.com/robolectric/robolectric/issues/6593)
133-
testImplementation 'org.robolectric:robolectric:4.12.2'
133+
testImplementation 'org.robolectric:robolectric:4.13'
134134
}
135135

136136
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

‎AccessibilityCodelab/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
}
2222

2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:8.5.0'
24+
classpath 'com.android.tools.build:gradle:8.6.0'
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
2626
}
2727
}

‎AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

‎AccessibilityCodelab/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.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎AccessibilityCodelab/gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

‎AccessibilityCodelab/gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

‎AdaptiveUiCodelab/gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
2-
androidGradlePlugin = "8.5.0"
3-
composeBom = "2024.06.00"
2+
androidGradlePlugin = "8.6.0"
3+
composeBom = "2024.09.00"
44
coreKtx = "1.13.1"
5-
activityCompose = "1.9.0"
6-
espressoCore = "3.6.0"
5+
activityCompose = "1.9.2"
6+
espressoCore = "3.6.1"
77
junit = "4.13.2"
8-
junitVersion = "1.2.0"
8+
junitVersion = "1.2.1"
99
kotlin = "2.0.20"
1010
kotlinxCoroutinesAndroid = "1.8.1"
11-
lifecycle = "2.8.2"
11+
lifecycle = "2.8.5"
1212
window = "1.3.0"
1313

1414
[libraries]

‎AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

‎AdaptiveUiCodelab/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.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎AdaptiveUiCodelab/gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

‎AdaptiveUiCodelab/gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

‎AdvancedStateAndSideEffectsCodelab/app/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ dependencies {
103103
}
104104
}
105105

106-
implementation "androidx.activity:activity-compose:1.9.0"
106+
implementation "androidx.activity:activity-compose:1.9.2"
107107
implementation "androidx.appcompat:appcompat:1.7.0"
108108
implementation "androidx.tracing:tracing:1.2.0"
109109

110-
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
110+
def composeBom = platform('androidx.compose:compose-bom:2024.09.00')
111111
implementation(composeBom)
112112
androidTestImplementation(composeBom)
113113
implementation "androidx.compose.runtime:runtime"
@@ -120,22 +120,22 @@ dependencies {
120120
debugImplementation "androidx.compose.ui:ui-tooling"
121121
debugImplementation "androidx.compose.ui:ui-test-manifest"
122122

123-
def lifecycle_version = "2.8.2"
123+
def lifecycle_version = "2.8.5"
124124
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
125125
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
126-
implementation "com.google.dagger:hilt-android:2.51.1"
127-
kapt "com.google.dagger:hilt-compiler:2.51.1"
126+
implementation "com.google.dagger:hilt-android:2.52"
127+
kapt "com.google.dagger:hilt-compiler:2.52"
128128

129-
implementation "io.coil-kt:coil-compose:2.6.0"
129+
implementation "io.coil-kt:coil-compose:2.7.0"
130130

131131
androidTestImplementation "junit:junit:4.13.2"
132-
androidTestImplementation "androidx.test:core:1.6.0"
133-
androidTestImplementation "androidx.test:runner:1.6.0"
134-
androidTestImplementation "androidx.test:rules:1.6.0"
135-
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.0"
136-
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.0"
132+
androidTestImplementation "androidx.test:core:1.6.1"
133+
androidTestImplementation "androidx.test:runner:1.6.2"
134+
androidTestImplementation "androidx.test:rules:1.6.1"
135+
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
136+
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
137137
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1"
138-
androidTestImplementation "com.google.dagger:hilt-android:2.51.1"
139-
androidTestImplementation "com.google.dagger:hilt-android-testing:2.51.1"
140-
kaptAndroidTest "com.google.dagger:hilt-compiler:2.51.1"
138+
androidTestImplementation "com.google.dagger:hilt-android:2.52"
139+
androidTestImplementation "com.google.dagger:hilt-android-testing:2.52"
140+
kaptAndroidTest "com.google.dagger:hilt-compiler:2.52"
141141
}

‎AdvancedStateAndSideEffectsCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath "com.android.tools.build:gradle:8.5.0"
23+
classpath "com.android.tools.build:gradle:8.6.0"
2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
25-
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
25+
classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
2626
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
2727
}
2828
}

‎AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

‎AdvancedStateAndSideEffectsCodelab/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.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎AdvancedStateAndSideEffectsCodelab/gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

‎AdvancedStateAndSideEffectsCodelab/gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

‎AnimationCodelab/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:8.5.0'
23+
classpath 'com.android.tools.build:gradle:8.6.0'
2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
2525
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
2626
}

0 commit comments

Comments
 (0)