Skip to content

Commit

Permalink
Merge pull request #444 from android/renovate/main-all
Browse files Browse the repository at this point in the history
Update all dependencies (main)
  • Loading branch information
mlykotom committed Jun 17, 2024
2 parents 3683b97 + c8ee8e6 commit f6ae4a9
Show file tree
Hide file tree
Showing 27 changed files with 74 additions and 66 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,21 @@ jobs:

test:
needs: build
runs-on: macos-13
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
matrix:
api-level: [26, 29]

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

Expand Down
14 changes: 7 additions & 7 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -113,15 +113,15 @@ dependencies {

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

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-ktx:1.9.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.activity:activity-compose:1.9.0"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2"

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

Expand All @@ -130,7 +130,7 @@ dependencies {

// TODO: Bump to latest after Espresso 3.5.0 goes stable
// (due to https://github.com/robolectric/robolectric/issues/6593)
testImplementation 'org.robolectric:robolectric:4.12.1'
testImplementation 'org.robolectric:robolectric:4.12.2'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.4.0'
classpath 'com.android.tools.build:gradle:8.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
}
}
Expand Down
8 changes: 4 additions & 4 deletions AdaptiveUiCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ android {
dependencies {


def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -74,11 +74,11 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"

implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.2"
implementation 'androidx.activity:activity-compose:1.9.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.window:window:1.2.0"
implementation "androidx.window:window:1.3.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"

testImplementation 'junit:junit:4.13.2'
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "com.android.tools.build:gradle:8.5.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
Expand Down
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ dependencies {
}

implementation "androidx.activity:activity-compose:1.9.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.appcompat:appcompat:1.7.0"

def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -119,7 +119,7 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"

def lifecycle_version = "2.7.0"
def lifecycle_version = "2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.51.1"
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "com.android.tools.build:gradle:8.5.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.4.0'
classpath 'com.android.tools.build:gradle:8.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.9.0'
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/start/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.9.0'
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -71,8 +71,8 @@ dependencies {
implementation 'androidx.compose.material3:material3-window-size-class:1.2.1'
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.11.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation "com.google.android.material:material:1.12.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.2'
implementation 'androidx.activity:activity-compose:1.9.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "com.android.tools.build:gradle:8.5.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
Expand Down
8 changes: 4 additions & 4 deletions BasicStateCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@ android {

dependencies {
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2")
implementation("androidx.activity:activity-compose:1.9.0")
implementation(platform("androidx.compose:compose-bom:2024.05.00"))
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
2 changes: 1 addition & 1 deletion BasicStateCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.4.0'
classpath 'com.android.tools.build:gradle:8.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
Expand Down
6 changes: 3 additions & 3 deletions BasicsCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ android {

dependencies {
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
implementation("androidx.activity:activity-compose:1.9.0")
implementation(platform("androidx.compose:compose-bom:2024.05.00"))
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -76,7 +76,7 @@ dependencies {
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
2 changes: 1 addition & 1 deletion BasicsCodelab/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.4.0" apply false
id("com.android.application") version "8.5.0" apply false
id("org.jetbrains.kotlin.android") version "2.0.0" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false
}
16 changes: 8 additions & 8 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,28 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

kapt "androidx.room:room-compiler:2.6.1"
kapt "com.github.bumptech.glide:compiler:4.16.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.13.1"
implementation "androidx.fragment:fragment-ktx:1.7.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
implementation "androidx.fragment:fragment-ktx:1.8.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
implementation "androidx.navigation:navigation-fragment-ktx:2.7.7"
implementation "androidx.navigation:navigation-ui-ktx:2.7.7"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation "androidx.room:room-runtime:2.6.1"
implementation "androidx.room:room-ktx:2.6.1"
implementation "androidx.viewpager2:viewpager2:1.0.0"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.9.0"
implementation "com.github.bumptech.glide:glide:4.16.0"
implementation "com.google.android.material:material:1.11.0"
implementation "com.google.code.gson:gson:2.10.1"
implementation "com.google.android.material:material:1.12.0"
implementation "com.google.code.gson:gson:2.11.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"

Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "com.android.tools.build:gradle:8.5.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
Expand Down
6 changes: 3 additions & 3 deletions NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.core:core-ktx:1.13.1"
implementation "com.google.android.material:material:1.11.0"
implementation "com.google.android.material:material:1.12.0"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "com.android.tools.build:gradle:8.5.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
Expand Down
10 changes: 5 additions & 5 deletions PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[versions]
coil = "2.6.0"
com-android-application = "8.3.2"
com-android-application = "8.5.0"
desugar_jdk_libs = "2.0.4"
kotlinx-datetime = "0.6.0"
lifecycle-viewmodel-compose = "2.7.0"
material-icons-core = "1.6.7"
lifecycle-viewmodel-compose = "2.8.2"
material-icons-core = "1.6.8"
media3 = "1.3.1"
org-jetbrains-kotlin-android = "2.0.0"
core-ktx = "1.13.1"
junit = "4.13.2"
androidx-test-ext-junit = "1.1.5"
espresso-core = "3.5.1"
lifecycle-runtime-ktx = "2.7.0"
lifecycle-runtime-ktx = "2.8.2"
activity-compose = "1.9.0"
compose-bom = "2024.05.00"
compose-bom = "2024.06.00"
runtime-tracing = "1.0.0-beta01"
tracing-ktx = "1.3.0-alpha02"
tracing-perfetto = "1.0.0"
Expand Down
8 changes: 4 additions & 4 deletions TestingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.core:core-ktx:1.13.1"
implementation "com.google.android.material:material:1.11.0"
implementation "androidx.fragment:fragment-ktx:1.7.0"
implementation "com.google.android.material:material:1.12.0"
implementation "androidx.fragment:fragment-ktx:1.8.0"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "com.android.tools.build:gradle:8.5.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
Expand Down
Loading

0 comments on commit f6ae4a9

Please sign in to comment.