Skip to content

Commit f6ae4a9

Browse files
mlykotommlykotom
authored
Merge pull request #444 from android/renovate/main-all
Update all dependencies (main)
2 parents 3683b97 + c8ee8e6 commit f6ae4a9

File tree

27 files changed

+74
-66
lines changed

27 files changed

+74
-66
lines changed

‎.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,21 @@ jobs:
6161

6262
test:
6363
needs: build
64-
runs-on: macos-13
64+
runs-on: ubuntu-latest
6565
timeout-minutes: 30
6666
strategy:
6767
matrix:
6868
api-level: [26, 29]
6969

7070
steps:
71+
# https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners
72+
- name: Enable KVM group perms
73+
run: |
74+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
75+
sudo udevadm control --reload-rules
76+
sudo udevadm trigger --name-match=kvm
77+
ls /dev/kvm
78+
7179
- name: Checkout
7280
uses: actions/checkout@v4
7381

‎AccessibilityCodelab/app/build.gradle

Lines changed: 7 additions & 7 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.05.00')
90+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
9191
implementation(composeBom)
9292
testImplementation(composeBom)
9393
androidTestImplementation(composeBom)
@@ -113,15 +113,15 @@ dependencies {
113113

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

116-
implementation 'androidx.appcompat:appcompat:1.6.1'
116+
implementation 'androidx.appcompat:appcompat:1.7.0'
117117
implementation 'androidx.activity:activity-ktx:1.9.0'
118118
implementation 'androidx.core:core-ktx:1.13.1'
119119
implementation "androidx.activity:activity-compose:1.9.0"
120120

121-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
122-
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0"
123-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
124-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
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"
125125

126126
implementation 'androidx.navigation:navigation-compose:2.7.7'
127127

@@ -130,7 +130,7 @@ dependencies {
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.1'
133+
testImplementation 'org.robolectric:robolectric:4.12.2'
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.4.0'
24+
classpath 'com.android.tools.build:gradle:8.5.0'
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2626
}
2727
}

‎AdaptiveUiCodelab/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ android {
6363
dependencies {
6464

6565

66-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
66+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
6767
implementation(composeBom)
6868
androidTestImplementation(composeBom)
6969

@@ -74,11 +74,11 @@ dependencies {
7474
debugImplementation "androidx.compose.ui:ui-tooling"
7575
debugImplementation "androidx.compose.ui:ui-test-manifest"
7676

77-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
78-
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
77+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2"
78+
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.2"
7979
implementation 'androidx.activity:activity-compose:1.9.0'
8080
implementation 'androidx.core:core-ktx:1.13.1'
81-
implementation "androidx.window:window:1.2.0"
81+
implementation "androidx.window:window:1.3.0"
8282
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
8383

8484
testImplementation 'junit:junit:4.13.2'

‎AdaptiveUiCodelab/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildscript {
1919
mavenCentral()
2020
}
2121
dependencies {
22-
classpath "com.android.tools.build:gradle:8.4.0"
22+
classpath "com.android.tools.build:gradle:8.5.0"
2323
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2424
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2525
}

‎AdvancedStateAndSideEffectsCodelab/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ dependencies {
104104
}
105105

106106
implementation "androidx.activity:activity-compose:1.9.0"
107-
implementation "androidx.appcompat:appcompat:1.6.1"
107+
implementation "androidx.appcompat:appcompat:1.7.0"
108108

109-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
109+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
110110
implementation(composeBom)
111111
androidTestImplementation(composeBom)
112112
implementation "androidx.compose.runtime:runtime"
@@ -119,7 +119,7 @@ dependencies {
119119
debugImplementation "androidx.compose.ui:ui-tooling"
120120
debugImplementation "androidx.compose.ui:ui-test-manifest"
121121

122-
def lifecycle_version = "2.7.0"
122+
def lifecycle_version = "2.8.2"
123123
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
124124
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
125125
implementation "com.google.dagger:hilt-android:2.51.1"

‎AdvancedStateAndSideEffectsCodelab/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.4.0"
23+
classpath "com.android.tools.build:gradle:8.5.0"
2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2525
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
2626
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"

‎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.4.0'
23+
classpath 'com.android.tools.build:gradle:8.5.0'
2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2525
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2626
}

‎AnimationCodelab/finished/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343
}
4444

4545
dependencies {
46-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
46+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
4747
implementation(composeBom)
4848

4949
implementation 'androidx.activity:activity-compose:1.9.0'

‎AnimationCodelab/start/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343
}
4444

4545
dependencies {
46-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
46+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
4747
implementation(composeBom)
4848

4949
implementation 'androidx.activity:activity-compose:1.9.0'

‎BasicLayoutsCodelab/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ android {
6161
}
6262

6363
dependencies {
64-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
64+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
6565
implementation(composeBom)
6666
androidTestImplementation(composeBom)
6767

@@ -71,8 +71,8 @@ dependencies {
7171
implementation 'androidx.compose.material3:material3-window-size-class:1.2.1'
7272
implementation "androidx.compose.material:material-icons-extended"
7373
implementation "androidx.compose.ui:ui-tooling-preview"
74-
implementation "com.google.android.material:material:1.11.0"
75-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
74+
implementation "com.google.android.material:material:1.12.0"
75+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.2'
7676
implementation 'androidx.activity:activity-compose:1.9.0'
7777
testImplementation 'junit:junit:4.13.2'
7878
androidTestImplementation 'androidx.test.ext:junit:1.1.5'

‎BasicLayoutsCodelab/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.4.0"
23+
classpath "com.android.tools.build:gradle:8.5.0"
2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2525
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2626
}

‎BasicStateCodelab/app/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ android {
6565

6666
dependencies {
6767
implementation("androidx.core:core-ktx:1.13.1")
68-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
69-
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
68+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
69+
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2")
7070
implementation("androidx.activity:activity-compose:1.9.0")
71-
implementation(platform("androidx.compose:compose-bom:2024.05.00"))
71+
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
7272
implementation("androidx.compose.ui:ui")
7373
implementation("androidx.compose.ui:ui-graphics")
7474
implementation("androidx.compose.ui:ui-tooling-preview")
7575
implementation("androidx.compose.material3:material3")
7676
testImplementation("junit:junit:4.13.2")
7777
androidTestImplementation("androidx.test.ext:junit:1.1.5")
7878
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
79-
androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.00"))
79+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00"))
8080
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
8181
debugImplementation("androidx.compose.ui:ui-tooling")
8282
debugImplementation("androidx.compose.ui:ui-test-manifest")

‎BasicStateCodelab/build.gradle

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

2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:8.4.0'
23+
classpath 'com.android.tools.build:gradle:8.5.0'
2424
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2525
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2626
}

‎BasicsCodelab/app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ android {
6565

6666
dependencies {
6767
implementation("androidx.core:core-ktx:1.13.1")
68-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
68+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
6969
implementation("androidx.activity:activity-compose:1.9.0")
70-
implementation(platform("androidx.compose:compose-bom:2024.05.00"))
70+
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
7171
implementation("androidx.compose.ui:ui")
7272
implementation("androidx.compose.ui:ui-graphics")
7373
implementation("androidx.compose.ui:ui-tooling-preview")
@@ -76,7 +76,7 @@ dependencies {
7676
testImplementation("junit:junit:4.13.2")
7777
androidTestImplementation("androidx.test.ext:junit:1.1.5")
7878
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
79-
androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.00"))
79+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00"))
8080
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
8181
debugImplementation("androidx.compose.ui:ui-tooling")
8282
debugImplementation("androidx.compose.ui:ui-test-manifest")

‎BasicsCodelab/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818
plugins {
19-
id("com.android.application") version "8.4.0" apply false
19+
id("com.android.application") version "8.5.0" apply false
2020
id("org.jetbrains.kotlin.android") version "2.0.0" apply false
2121
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false
2222
}

‎MigrationCodelab/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,28 @@ android {
6060
}
6161

6262
dependencies {
63-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
63+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
6464
implementation(composeBom)
6565
androidTestImplementation(composeBom)
6666

6767
kapt "androidx.room:room-compiler:2.6.1"
6868
kapt "com.github.bumptech.glide:compiler:4.16.0"
69-
implementation "androidx.appcompat:appcompat:1.6.1"
69+
implementation "androidx.appcompat:appcompat:1.7.0"
7070
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
7171
implementation "androidx.core:core-ktx:1.13.1"
72-
implementation "androidx.fragment:fragment-ktx:1.7.0"
73-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
74-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
72+
implementation "androidx.fragment:fragment-ktx:1.8.0"
73+
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
74+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
7575
implementation "androidx.navigation:navigation-fragment-ktx:2.7.7"
7676
implementation "androidx.navigation:navigation-ui-ktx:2.7.7"
7777
implementation "androidx.recyclerview:recyclerview:1.3.2"
7878
implementation "androidx.room:room-runtime:2.6.1"
7979
implementation "androidx.room:room-ktx:2.6.1"
80-
implementation "androidx.viewpager2:viewpager2:1.0.0"
80+
implementation "androidx.viewpager2:viewpager2:1.1.0"
8181
implementation "androidx.work:work-runtime-ktx:2.9.0"
8282
implementation "com.github.bumptech.glide:glide:4.16.0"
83-
implementation "com.google.android.material:material:1.11.0"
84-
implementation "com.google.code.gson:gson:2.10.1"
83+
implementation "com.google.android.material:material:1.12.0"
84+
implementation "com.google.code.gson:gson:2.11.0"
8585
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
8686
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
8787

‎MigrationCodelab/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.4.0"
24+
classpath "com.android.tools.build:gradle:8.5.0"
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2626
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
2727
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"

‎NavigationCodelab/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ android {
8181
}
8282

8383
dependencies {
84-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
84+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
8585
implementation(composeBom)
8686
androidTestImplementation(composeBom)
8787

88-
implementation "androidx.appcompat:appcompat:1.6.1"
88+
implementation "androidx.appcompat:appcompat:1.7.0"
8989
implementation "androidx.core:core-ktx:1.13.1"
90-
implementation "com.google.android.material:material:1.11.0"
90+
implementation "com.google.android.material:material:1.12.0"
9191

9292
// Compose
9393
implementation "androidx.compose.runtime:runtime"

‎NavigationCodelab/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.4.0"
24+
classpath "com.android.tools.build:gradle:8.5.0"
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2626
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2727
}

‎PerformanceCodelab/gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[versions]
22
coil = "2.6.0"
3-
com-android-application = "8.3.2"
3+
com-android-application = "8.5.0"
44
desugar_jdk_libs = "2.0.4"
55
kotlinx-datetime = "0.6.0"
6-
lifecycle-viewmodel-compose = "2.7.0"
7-
material-icons-core = "1.6.7"
6+
lifecycle-viewmodel-compose = "2.8.2"
7+
material-icons-core = "1.6.8"
88
media3 = "1.3.1"
99
org-jetbrains-kotlin-android = "2.0.0"
1010
core-ktx = "1.13.1"
1111
junit = "4.13.2"
1212
androidx-test-ext-junit = "1.1.5"
1313
espresso-core = "3.5.1"
14-
lifecycle-runtime-ktx = "2.7.0"
14+
lifecycle-runtime-ktx = "2.8.2"
1515
activity-compose = "1.9.0"
16-
compose-bom = "2024.05.00"
16+
compose-bom = "2024.06.00"
1717
runtime-tracing = "1.0.0-beta01"
1818
tracing-ktx = "1.3.0-alpha02"
1919
tracing-perfetto = "1.0.0"

‎TestingCodelab/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ android {
8484
}
8585

8686
dependencies {
87-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
87+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
8888
implementation(composeBom)
8989
androidTestImplementation(composeBom)
9090

91-
implementation "androidx.appcompat:appcompat:1.6.1"
91+
implementation "androidx.appcompat:appcompat:1.7.0"
9292
implementation "androidx.core:core-ktx:1.13.1"
93-
implementation "com.google.android.material:material:1.11.0"
94-
implementation "androidx.fragment:fragment-ktx:1.7.0"
93+
implementation "com.google.android.material:material:1.12.0"
94+
implementation "androidx.fragment:fragment-ktx:1.8.0"
9595

9696
// Compose
9797
implementation "androidx.compose.runtime:runtime"

‎TestingCodelab/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.4.0"
24+
classpath "com.android.tools.build:gradle:8.5.0"
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2626
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2727
}

0 commit comments

Comments
 (0)