Skip to content

Commit ceb05a2

Browse files
authored
Merge pull request #445 from android/renovate/end-all
Update all dependencies (end)
2 parents 6603c7b + ad4b8c4 commit ceb05a2

File tree

18 files changed

+63
-55
lines changed

18 files changed

+63
-55
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ android {
7070
}
7171

7272
dependencies {
73-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
73+
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
7474
implementation(composeBom)
7575
testImplementation(composeBom)
7676
androidTestImplementation(composeBom)
@@ -94,19 +94,19 @@ dependencies {
9494
implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version"
9595
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
9696

97-
implementation "com.google.android.material:material:1.11.0"
97+
implementation "com.google.android.material:material:1.12.0"
9898

9999
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
100100

101-
implementation 'androidx.appcompat:appcompat:1.6.1'
101+
implementation 'androidx.appcompat:appcompat:1.7.0'
102102
implementation 'androidx.activity:activity-ktx:1.9.0'
103103
implementation 'androidx.core:core-ktx:1.13.1'
104104
implementation "androidx.activity:activity-compose:1.9.0"
105105

106-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
107-
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0"
108-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
109-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
106+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
107+
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2"
108+
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
109+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2"
110110

111111
implementation 'androidx.navigation:navigation-compose:2.7.7'
112112

@@ -115,7 +115,7 @@ dependencies {
115115

116116
// TODO: Bump to latest after Espresso 3.5.0 goes stable
117117
// (due to https://github.com/robolectric/robolectric/issues/6593)
118-
testImplementation 'org.robolectric:robolectric:4.12.1'
118+
testImplementation 'org.robolectric:robolectric:4.12.2'
119119
}
120120

121121
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
implementation "androidx.compose.material3:material3-window-size-class:1.2.1"
8484

AdaptiveUiCodelab/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
}

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"
@@ -120,7 +120,7 @@ dependencies {
120120
debugImplementation "androidx.compose.ui:ui-test-manifest"
121121

122122

123-
def lifecycle_version = "2.7.0"
123+
def lifecycle_version = "2.8.2"
124124
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
125125
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
126126
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"

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"

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
@@ -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
}

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

0 commit comments

Comments
 (0)