Skip to content

Commit

Permalink
Update all dependencies (main) (#422)
Browse files Browse the repository at this point in the history
* Update all dependencies

* Use @SdkSuppress instead of @RequiresApi in test

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Chris Arriola <[email protected]>
  • Loading branch information
renovate[bot] and arriolac authored Mar 6, 2024
1 parent 120f9e2 commit 7bd4788
Show file tree
Hide file tree
Showing 26 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.02.01')
def composeBom = platform('androidx.compose:compose-bom:2024.02.02')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
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.2.2'
classpath 'com.android.tools.build:gradle:8.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUICodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ android {
dependencies {


def composeBom = platform('androidx.compose:compose-bom:2024.02.01')
def composeBom = platform('androidx.compose:compose-bom:2024.02.02')
implementation(composeBom)
androidTestImplementation(composeBom)

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.2.2"
classpath "com.android.tools.build:gradle:8.3.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
Expand Down
14 changes: 7 additions & 7 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ dependencies {
implementation "androidx.activity:activity-compose:1.8.2"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2024.02.01')
def composeBom = platform('androidx.compose:compose-bom:2024.02.02')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -125,10 +125,10 @@ dependencies {
def lifecycle_version = "2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.50"
kapt "com.google.dagger:hilt-compiler:2.50"
implementation "com.google.dagger:hilt-android:2.51"
kapt "com.google.dagger:hilt-compiler:2.51"

implementation "io.coil-kt:coil-compose:2.5.0"
implementation "io.coil-kt:coil-compose:2.6.0"

androidTestImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:core:1.5.0"
Expand All @@ -137,7 +137,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0"
androidTestImplementation "com.google.dagger:hilt-android:2.50"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.50"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.50"
androidTestImplementation "com.google.dagger:hilt-android:2.51"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.51"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.51"
}
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.2.2"
classpath "com.android.tools.build:gradle:8.3.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.50"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51"
}
}

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.2.2'
classpath 'com.android.tools.build:gradle:8.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

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

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

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

implementation 'androidx.activity:activity-compose:1.8.2'
Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.compose.ui:ui"
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class:1.2.0'
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"
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.2.2"
classpath "com.android.tools.build:gradle:8.3.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
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 @@ -70,15 +70,15 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("androidx.activity:activity-compose:1.8.2")
implementation(platform("androidx.compose:compose-bom:2024.02.01"))
implementation(platform("androidx.compose:compose-bom:2024.02.02"))
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.02.01"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.02"))
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.2.2'
classpath 'com.android.tools.build:gradle:8.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
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 @@ -69,7 +69,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.activity:activity-compose:1.8.2")
implementation(platform("androidx.compose:compose-bom:2024.02.01"))
implementation(platform("androidx.compose:compose-bom:2024.02.02"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -78,7 +78,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.02.01"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.02"))
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,6 +16,6 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.2.2" apply false
id("com.android.application") version "8.3.0" apply false
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
}
4 changes: 2 additions & 2 deletions MigrationCodelab/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.02.01')
def composeBom = platform('androidx.compose:compose-bom:2024.02.02')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down Expand Up @@ -105,7 +105,7 @@ dependencies {
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
androidTestImplementation "androidx.work:work-testing:2.9.0"
androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.0"
androidTestImplementation "com.google.truth:truth:1.4.1"
androidTestImplementation "com.google.truth:truth:1.4.2"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
testImplementation "junit:junit:4.13.2"
}
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.2.2"
classpath "com.android.tools.build:gradle:8.3.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
}
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.02.01')
def composeBom = platform('androidx.compose:compose-bom:2024.02.02')
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.2.2"
classpath "com.android.tools.build:gradle:8.3.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/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.02.01')
def composeBom = platform('androidx.compose:compose-bom:2024.02.02')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package com.example.compose.rally
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.os.Build
import androidx.annotation.RequiresApi
import androidx.compose.ui.graphics.asAndroidBitmap
import androidx.compose.ui.test.SemanticsNodeInteraction
import androidx.compose.ui.test.captureToImage
import androidx.test.filters.SdkSuppress
import androidx.test.platform.app.InstrumentationRegistry
import java.io.FileOutputStream

Expand All @@ -35,7 +35,7 @@ import java.io.FileOutputStream
*
* Screenshots are saved on device in `/data/data/{package}/files`.
*/
@RequiresApi(Build.VERSION_CODES.O)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
fun assertScreenshotMatchesGolden(
goldenName: String,
node: SemanticsNodeInteraction
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.2.2"
classpath "com.android.tools.build:gradle:8.3.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.02.01')
def composeBom = platform('androidx.compose:compose-bom:2024.02.02')
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.2.2'
classpath 'com.android.tools.build:gradle:8.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelabM2/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.12.0'
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelabM2/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.2.2"
classpath "com.android.tools.build:gradle:8.3.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
}
}
Expand Down

0 comments on commit 7bd4788

Please sign in to comment.