Skip to content

Commit

Permalink
Merge pull request #499 from android/renovate/main-all
Browse files Browse the repository at this point in the history
Update all dependencies (main)
  • Loading branch information
riggaroo authored Dec 19, 2024
2 parents c33b618 + b124f97 commit 15f0e76
Show file tree
Hide file tree
Showing 38 changed files with 57 additions and 57 deletions.
6 changes: 3 additions & 3 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.10.01')
def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -123,14 +123,14 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7"

implementation 'androidx.navigation:navigation-compose:2.8.3'
implementation 'androidx.navigation:navigation-compose:2.8.5'

androidTestImplementation 'androidx.test:rules:1.6.1'
androidTestImplementation 'androidx.test:runner:1.6.2'

// 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.13'
testImplementation 'org.robolectric:robolectric:4.14.1'
}

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.7.2'
classpath 'com.android.tools.build:gradle:8.7.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
androidGradlePlugin = "8.7.2"
composeBom = "2024.10.01"
androidGradlePlugin = "8.7.3"
composeBom = "2024.12.01"
coreKtx = "1.15.0"
activityCompose = "1.9.3"
espressoCore = "3.6.1"
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
12 changes: 6 additions & 6 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.tracing:tracing:1.2.0"

def composeBom = platform('androidx.compose:compose-bom:2024.10.01')
def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -123,8 +123,8 @@ dependencies {
def lifecycle_version = "2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.52"
kapt "com.google.dagger:hilt-compiler:2.52"
implementation "com.google.dagger:hilt-android:2.53.1"
kapt "com.google.dagger:hilt-compiler:2.53.1"

implementation "io.coil-kt:coil-compose:2.7.0"

Expand All @@ -135,7 +135,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0"
androidTestImplementation "com.google.dagger:hilt-android:2.52"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.52"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.52"
androidTestImplementation "com.google.dagger:hilt-android:2.53.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.53.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.53.1"
}
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.7.2"
classpath "com.android.tools.build:gradle:8.7.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.53.1"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
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.7.2'
classpath 'com.android.tools.build:gradle:8.7.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
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.10.01')
def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.9.3'
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
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.10.01')
def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.9.3'
Expand Down
2 changes: 1 addition & 1 deletion 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.10.01')
def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
implementation(composeBom)
androidTestImplementation(composeBom)

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.7.2"
classpath "com.android.tools.build:gradle:8.7.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions BasicStateCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
implementation("androidx.activity:activity-compose:1.9.3")
implementation(platform("androidx.compose:compose-bom:2024.10.01"))
implementation(platform("androidx.compose:compose-bom:2024.12.01"))
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.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.10.01"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.12.01"))
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.7.2'
classpath 'com.android.tools.build:gradle:8.7.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
Expand Down
2 changes: 1 addition & 1 deletion BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions BasicsCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.activity:activity-compose:1.9.3")
implementation(platform("androidx.compose:compose-bom:2024.10.01"))
implementation(platform("androidx.compose:compose-bom:2024.12.01"))
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.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.10.01"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.12.01"))
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.7.2" apply false
id("com.android.application") version "8.7.3" apply false
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
}
2 changes: 1 addition & 1 deletion BasicsCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ android {
}

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

Expand All @@ -72,8 +72,8 @@ dependencies {
implementation "androidx.fragment:fragment-ktx:1.8.5"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
implementation "androidx.navigation:navigation-fragment-ktx:2.8.3"
implementation "androidx.navigation:navigation-ui-ktx:2.8.3"
implementation "androidx.navigation:navigation-fragment-ktx:2.8.5"
implementation "androidx.navigation:navigation-ui-ktx:2.8.5"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation "androidx.room:room-runtime:2.6.1"
implementation "androidx.room:room-ktx:2.6.1"
Expand Down
4 changes: 2 additions & 2 deletions MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.7.2"
classpath "com.android.tools.build:gradle:8.7.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.5"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ android {
}

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

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.7.2"
classpath "com.android.tools.build:gradle:8.7.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
12 changes: 6 additions & 6 deletions PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[versions]
coil = "2.7.0"
com-android-application = "8.7.2"
desugar_jdk_libs = "2.1.2"
com-android-application = "8.7.3"
desugar_jdk_libs = "2.1.3"
kotlinx-datetime = "0.6.1"
lifecycle-viewmodel-compose = "2.8.7"
material-icons-core = "1.7.5"
media3 = "1.4.1"
material-icons-core = "1.7.6"
media3 = "1.5.0"
org-jetbrains-kotlin-android = "2.0.21"
core-ktx = "1.15.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.2.1"
espresso-core = "3.6.1"
lifecycle-runtime-ktx = "2.8.7"
activity-compose = "1.9.3"
compose-bom = "2024.10.01"
runtime-tracing = "1.7.5"
compose-bom = "2024.12.01"
runtime-tracing = "1.7.6"
tracing-ktx = "1.3.0-alpha02"
tracing-perfetto = "1.0.0"
uiautomator = "2.3.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ android {
}

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

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.7.2"
classpath "com.android.tools.build:gradle:8.7.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/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.10.01')
def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/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.7.2'
classpath 'com.android.tools.build:gradle:8.7.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit 15f0e76

Please sign in to comment.