Skip to content

Commit 8e4bde2

Browse files
authored
Merge branch 'main' into tweak-gha-configs
2 parents e33e8b0 + f6ae4a9 commit 8e4bde2

File tree

26 files changed

+65
-65
lines changed

26 files changed

+65
-65
lines changed

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'

0 commit comments

Comments
 (0)