Skip to content

Commit

Permalink
Update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@renovate
renovate[bot] authored May 10, 2023
1 parent deb6c41 commit 5e8074e
Show file tree
Hide file tree
Showing 17 changed files with 59 additions and 58 deletions.
8 changes: 4 additions & 4 deletions AccessibilityCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.7'
}

packagingOptions {
Expand All @@ -90,7 +90,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -119,7 +119,7 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.7.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.activity:activity-compose:1.7.1"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
Expand All @@ -134,7 +134,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.10'
testImplementation 'org.robolectric:robolectric:4.10.2'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
Expand Down
6 changes: 3 additions & 3 deletions AdaptiveUICodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.7'
}
packagingOptions {
resources {
Expand All @@ -65,7 +65,7 @@ android {
dependencies {


def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -79,7 +79,7 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.window:window:1.0.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"

Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion "1.4.6"
kotlinCompilerExtensionVersion "1.4.7"
}

packagingOptions {
Expand All @@ -110,7 +110,7 @@ dependencies {
implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
6 changes: 3 additions & 3 deletions AnimationCodelab/finished/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ android {
jvmTarget = '1.8'
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.7'
}
}

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

implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
6 changes: 3 additions & 3 deletions AnimationCodelab/start/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ android {
jvmTarget = '1.8'
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.7'
}
}

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

implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
8 changes: 4 additions & 4 deletions BasicLayoutsCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.7'
}
packagingOptions {
resources {
Expand All @@ -63,16 +63,16 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.8.0"
implementation "com.google.android.material:material:1.9.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
testImplementation 'junit:junit:4.13.2'
Expand Down
6 changes: 3 additions & 3 deletions BasicStateCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.7'
}
packagingOptions {
resources {
Expand All @@ -61,10 +61,10 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
6 changes: 3 additions & 3 deletions BasicsCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion "1.4.6"
kotlinCompilerExtensionVersion "1.4.7"
}
}

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

implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
implementation "androidx.compose.ui:ui"
Expand Down
8 changes: 4 additions & 4 deletions MigrationCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.7'
}
packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
Expand All @@ -61,15 +61,15 @@ android {
}

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

kapt "androidx.room:room-compiler:2.5.1"
kapt "com.github.bumptech.glide:compiler:4.15.1"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.10.0"
implementation "androidx.core:core-ktx:1.10.1"
implementation "androidx.fragment:fragment-ktx:1.5.7"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
Expand All @@ -81,7 +81,7 @@ dependencies {
implementation "androidx.viewpager2:viewpager2:1.0.0"
implementation "androidx.work:work-runtime-ktx:2.8.1"
implementation "com.github.bumptech.glide:glide:4.15.1"
implementation "com.google.android.material:material:1.8.0"
implementation "com.google.android.material:material:1.9.0"
implementation "com.google.code.gson:gson:2.10.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
Expand Down
8 changes: 4 additions & 4 deletions NavigationCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion "1.4.6"
kotlinCompilerExtensionVersion "1.4.7"
}

packagingOptions {
Expand All @@ -80,13 +80,13 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.core:core-ktx:1.10.0"
implementation "com.google.android.material:material:1.8.0"
implementation "androidx.core:core-ktx:1.10.1"
implementation "com.google.android.material:material:1.9.0"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
8 changes: 4 additions & 4 deletions TestingCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion "1.4.6"
kotlinCompilerExtensionVersion "1.4.7"
}

packagingOptions {
Expand All @@ -87,13 +87,13 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.core:core-ktx:1.10.0"
implementation "com.google.android.material:material:1.8.0"
implementation "androidx.core:core-ktx:1.10.1"
implementation "com.google.android.material:material:1.9.0"
implementation "androidx.fragment:fragment-ktx:1.5.7"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20"

Expand Down
20 changes: 10 additions & 10 deletions ThemingCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.3.2'
kotlinCompilerExtensionVersion '1.4.7'
}

packagingOptions {
Expand All @@ -89,7 +89,7 @@ android {
}

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

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

implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'androidx.activity:activity-ktx:1.6.1'
implementation 'androidx.core:core-ktx:1.9.0'
implementation "androidx.activity:activity-compose:1.6.1"
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.7.1'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.activity:activity-compose:1.7.1"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"

androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.2'
Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelab/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath 'com.android.tools.build:gradle:8.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
}
}

plugins {
id 'com.diffplug.spotless' version '6.12.1'
id 'com.diffplug.spotless' version '6.18.0'
}

subprojects {
Expand Down
6 changes: 3 additions & 3 deletions ThemingCodelabM2/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.7'
}
}

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

implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
Expand Down
Binary file modified ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties
View file
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-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 5e8074e

Please sign in to comment.