Skip to content

Commit d25bef8

Browse files
renovate[bot]simona-anomis
renovate[bot]
and
simona-anomis
authored
Update all dependencies (main) (#442)
* Update all dependencies * Update deps and fix emulator runners for instrumentation tests * Update deps * Fix emulator failing * Fix UI tests running on CI and emulator issues --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Simona Milanovic <[email protected]>
1 parent 6790438 commit d25bef8

File tree

39 files changed

+84
-87
lines changed

39 files changed

+84
-87
lines changed

‎.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- end
87
paths:
98
- 'AdvancedStateAndSideEffectsCodelab/**'
109
pull_request:
@@ -62,11 +61,11 @@ jobs:
6261

6362
test:
6463
needs: build
65-
runs-on: macos-latest # enables hardware acceleration in the virtual machine
64+
runs-on: macos-13
6665
timeout-minutes: 30
6766
strategy:
6867
matrix:
69-
api-level: [23, 26, 29]
68+
api-level: [26, 29]
7069

7170
steps:
7271
- name: Checkout
@@ -106,5 +105,5 @@ jobs:
106105
if: always()
107106
uses: actions/upload-artifact@v4
108107
with:
109-
name: test-reports-${{ matrix.api-level }}
108+
name: test-reports-state-${{ matrix.api-level }}
110109
path: ${{ env.SAMPLE_PATH }}/app/build/reports

‎.github/workflows/MigrationCodelab.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- end
87
paths:
98
- 'MigrationCodelab/**'
109
pull_request:
@@ -62,11 +61,11 @@ jobs:
6261

6362
test:
6463
needs: build
65-
runs-on: macos-latest # enables hardware acceleration in the virtual machine
64+
runs-on: ubuntu-latest
6665
timeout-minutes: 30
6766
strategy:
6867
matrix:
69-
api-level: [23, 26, 29]
68+
api-level: [26, 29]
7069

7170
steps:
7271
- name: Checkout
@@ -96,7 +95,6 @@ jobs:
9695
uses: reactivecircus/android-emulator-runner@v2
9796
with:
9897
api-level: ${{ matrix.api-level }}
99-
target: google_apis
10098
arch: x86
10199
disable-animations: true
102100
script: ./gradlew connectedCheck --stacktrace
@@ -106,5 +104,5 @@ jobs:
106104
if: always()
107105
uses: actions/upload-artifact@v4
108106
with:
109-
name: test-reports-${{ matrix.api-level }}
107+
name: test-reports-migration-${{ matrix.api-level }}
110108
path: ${{ env.SAMPLE_PATH }}/app/build/reports

‎AccessibilityCodelab/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ android {
8080
}
8181

8282
composeOptions {
83-
kotlinCompilerExtensionVersion '1.5.10'
83+
kotlinCompilerExtensionVersion '1.5.13'
8484
}
8585

8686
packagingOptions {
@@ -90,7 +90,7 @@ android {
9090
}
9191

9292
dependencies {
93-
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
93+
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
9494
implementation(composeBom)
9595
testImplementation(composeBom)
9696
androidTestImplementation(composeBom)
@@ -118,7 +118,7 @@ dependencies {
118118

119119
implementation 'androidx.appcompat:appcompat:1.6.1'
120120
implementation 'androidx.activity:activity-ktx:1.9.0'
121-
implementation 'androidx.core:core-ktx:1.13.0'
121+
implementation 'androidx.core:core-ktx:1.13.1'
122122
implementation "androidx.activity:activity-compose:1.9.0"
123123

124124
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"

‎AccessibilityCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ buildscript {
2121
}
2222

2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:8.3.2'
25-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
24+
classpath 'com.android.tools.build:gradle:8.4.0'
25+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
2626
}
2727
}
2828

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

‎AdaptiveUICodelab/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
compose true
5454
}
5555
composeOptions {
56-
kotlinCompilerExtensionVersion '1.5.10'
56+
kotlinCompilerExtensionVersion '1.5.13'
5757
}
5858
packagingOptions {
5959
resources {
@@ -65,7 +65,7 @@ android {
6565
dependencies {
6666

6767

68-
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
68+
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
6969
implementation(composeBom)
7070
androidTestImplementation(composeBom)
7171

@@ -79,7 +79,7 @@ dependencies {
7979
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
8080
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
8181
implementation 'androidx.activity:activity-compose:1.9.0'
82-
implementation 'androidx.core:core-ktx:1.13.0'
82+
implementation 'androidx.core:core-ktx:1.13.1'
8383
implementation "androidx.window:window:1.2.0"
8484
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
8585

‎AdaptiveUICodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ buildscript {
1919
mavenCentral()
2020
}
2121
dependencies {
22-
classpath "com.android.tools.build:gradle:8.3.2"
23-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
22+
classpath "com.android.tools.build:gradle:8.4.0"
23+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
2424
}
2525
}
2626

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

‎AdvancedStateAndSideEffectsCodelab/app/build.gradle

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

8686
composeOptions {
87-
kotlinCompilerExtensionVersion '1.5.10'
87+
kotlinCompilerExtensionVersion '1.5.13'
8888
}
8989

9090
packagingOptions {
@@ -109,7 +109,7 @@ dependencies {
109109
implementation "androidx.activity:activity-compose:1.9.0"
110110
implementation "androidx.appcompat:appcompat:1.6.1"
111111

112-
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
112+
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
113113
implementation(composeBom)
114114
androidTestImplementation(composeBom)
115115
implementation "androidx.compose.runtime:runtime"

‎AdvancedStateAndSideEffectsCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath "com.android.tools.build:gradle:8.3.2"
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
23+
classpath "com.android.tools.build:gradle:8.4.0"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
2525
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
2626
}
2727
}

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

‎AnimationCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:8.3.2'
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
23+
classpath 'com.android.tools.build:gradle:8.4.0'
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
2525
}
2626
}
2727

‎AnimationCodelab/finished/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ android {
4040
jvmTarget = '1.8'
4141
}
4242
composeOptions {
43-
kotlinCompilerExtensionVersion '1.5.10'
43+
kotlinCompilerExtensionVersion '1.5.13'
4444
}
4545
}
4646

4747
dependencies {
48-
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
48+
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
4949
implementation(composeBom)
5050

5151
implementation 'androidx.activity:activity-compose:1.9.0'
52-
implementation 'androidx.core:core-ktx:1.13.0'
52+
implementation 'androidx.core:core-ktx:1.13.1'
5353
implementation "androidx.compose.ui:ui"
5454
implementation "androidx.compose.material3:material3"
5555
implementation "androidx.compose.ui:ui-tooling-preview"

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

‎AnimationCodelab/start/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ android {
4040
jvmTarget = '1.8'
4141
}
4242
composeOptions {
43-
kotlinCompilerExtensionVersion '1.5.10'
43+
kotlinCompilerExtensionVersion '1.5.13'
4444
}
4545
}
4646

4747
dependencies {
48-
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
48+
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
4949
implementation(composeBom)
5050

5151
implementation 'androidx.activity:activity-compose:1.9.0'
52-
implementation 'androidx.core:core-ktx:1.13.0'
52+
implementation 'androidx.core:core-ktx:1.13.1'
5353
implementation "androidx.compose.ui:ui"
5454
implementation "androidx.compose.material3:material3"
5555
implementation "androidx.compose.ui:ui-tooling-preview"

‎BasicLayoutsCodelab/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
compose true
5454
}
5555
composeOptions {
56-
kotlinCompilerExtensionVersion '1.5.10'
56+
kotlinCompilerExtensionVersion '1.5.13'
5757
}
5858
packagingOptions {
5959
resources {
@@ -63,11 +63,11 @@ android {
6363
}
6464

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

70-
implementation 'androidx.core:core-ktx:1.13.0'
70+
implementation 'androidx.core:core-ktx:1.13.1'
7171
implementation "androidx.compose.ui:ui"
7272
implementation 'androidx.compose.material3:material3'
7373
implementation 'androidx.compose.material3:material3-window-size-class:1.2.1'

‎BasicLayoutsCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ buildscript {
2020
mavenCentral()
2121
}
2222
dependencies {
23-
classpath "com.android.tools.build:gradle:8.3.2"
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
23+
classpath "com.android.tools.build:gradle:8.4.0"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
2525
}
2626
}
2727

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

‎BasicStateCodelab/app/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ android {
5656
compose = true
5757
}
5858
composeOptions {
59-
kotlinCompilerExtensionVersion = "1.5.10"
59+
kotlinCompilerExtensionVersion = "1.5.13"
6060
}
6161
packaging {
6262
resources {
@@ -66,19 +66,19 @@ android {
6666
}
6767

6868
dependencies {
69-
implementation("androidx.core:core-ktx:1.13.0")
69+
implementation("androidx.core:core-ktx:1.13.1")
7070
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
7171
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
7272
implementation("androidx.activity:activity-compose:1.9.0")
73-
implementation(platform("androidx.compose:compose-bom:2024.04.01"))
73+
implementation(platform("androidx.compose:compose-bom:2024.05.00"))
7474
implementation("androidx.compose.ui:ui")
7575
implementation("androidx.compose.ui:ui-graphics")
7676
implementation("androidx.compose.ui:ui-tooling-preview")
7777
implementation("androidx.compose.material3:material3")
7878
testImplementation("junit:junit:4.13.2")
7979
androidTestImplementation("androidx.test.ext:junit:1.1.5")
8080
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
81-
androidTestImplementation(platform("androidx.compose:compose-bom:2024.04.01"))
81+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.00"))
8282
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
8383
debugImplementation("androidx.compose.ui:ui-tooling")
8484
debugImplementation("androidx.compose.ui:ui-test-manifest")

‎BasicStateCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ buildscript {
2020
}
2121

2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:8.3.2'
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
23+
classpath 'com.android.tools.build:gradle:8.4.0'
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
2525
}
2626
}
2727

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

‎BasicsCodelab/app/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ android {
5656
compose = true
5757
}
5858
composeOptions {
59-
kotlinCompilerExtensionVersion = "1.5.10"
59+
kotlinCompilerExtensionVersion = "1.5.13"
6060
}
6161
packaging {
6262
resources {
@@ -66,10 +66,10 @@ android {
6666
}
6767

6868
dependencies {
69-
implementation("androidx.core:core-ktx:1.13.0")
69+
implementation("androidx.core:core-ktx:1.13.1")
7070
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
7171
implementation("androidx.activity:activity-compose:1.9.0")
72-
implementation(platform("androidx.compose:compose-bom:2024.04.01"))
72+
implementation(platform("androidx.compose:compose-bom:2024.05.00"))
7373
implementation("androidx.compose.ui:ui")
7474
implementation("androidx.compose.ui:ui-graphics")
7575
implementation("androidx.compose.ui:ui-tooling-preview")
@@ -78,7 +78,7 @@ dependencies {
7878
testImplementation("junit:junit:4.13.2")
7979
androidTestImplementation("androidx.test.ext:junit:1.1.5")
8080
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
81-
androidTestImplementation(platform("androidx.compose:compose-bom:2024.04.01"))
81+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.00"))
8282
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
8383
debugImplementation("androidx.compose.ui:ui-tooling")
8484
debugImplementation("androidx.compose.ui:ui-test-manifest")

‎BasicsCodelab/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
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.3.2" apply false
20-
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
19+
id("com.android.application") version "8.4.0" apply false
20+
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
2121
}

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

0 commit comments

Comments
 (0)