Skip to content

Commit

Permalink
Merge pull request #363 from android/renovate/end-all
Browse files Browse the repository at this point in the history
Update all dependencies (end)
  • Loading branch information
mlykotom authored Jul 25, 2023
2 parents 1e0189c + 7fb5917 commit 8b7bc8a
Show file tree
Hide file tree
Showing 16 changed files with 52 additions and 52 deletions.
10 changes: 5 additions & 5 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -103,23 +103,23 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"

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

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"

implementation 'androidx.navigation:navigation-compose:2.5.3'
implementation 'androidx.navigation:navigation-compose:2.6.0'

androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.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.10.2'
testImplementation 'org.robolectric:robolectric:4.10.3'
}

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

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

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

subprojects {
Expand Down
8 changes: 4 additions & 4 deletions 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:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -78,11 +78,11 @@ 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.activity:activity-compose:1.7.2'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.window:window:1.0.0"
implementation "androidx.window:window:1.1.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
implementation "androidx.compose.material3:material3-window-size-class:1.2.0-alpha01"
implementation "androidx.compose.material3:material3-window-size-class:1.2.0-alpha02"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

plugins {
id 'com.android.application' version "8.0.1" apply false
id 'com.android.library' version "8.0.1" apply false
id 'com.android.application' version "8.0.2" apply false
id 'com.android.library' version "8.0.2" apply false
id 'org.jetbrains.kotlin.android' version "1.8.22" apply false
}

Expand Down
16 changes: 8 additions & 8 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.activity:activity-compose:1.7.2"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -128,10 +128,10 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.46"
kapt "com.google.dagger:hilt-compiler:2.46"
implementation "com.google.dagger:hilt-android:2.46.1"
kapt "com.google.dagger:hilt-compiler:2.46.1"

implementation "io.coil-kt:coil-compose:2.3.0"
implementation "io.coil-kt:coil-compose:2.4.0"

androidTestImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:core:1.5.0"
Expand All @@ -140,7 +140,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.7.1"
androidTestImplementation "com.google.dagger:hilt-android:2.46"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.46"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.46"
androidTestImplementation "com.google.dagger:hilt-android:2.46.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.46.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.46.1"
}
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.0.1"
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.46"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.46.1"
}
}

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

subprojects {
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,7 +63,7 @@ android {
}

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

Expand All @@ -74,7 +74,7 @@ dependencies {
implementation "androidx.compose.ui:ui-tooling-preview"
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'
implementation 'androidx.activity:activity-compose:1.7.2'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/

plugins {
id 'com.android.application' version '8.0.1' apply false
id 'com.android.library' version '8.0.1' apply false
id 'com.android.application' version '8.0.2' apply false
id 'com.android.library' version '8.0.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
id 'com.diffplug.spotless' version '6.18.0'
id 'com.diffplug.spotless' version '6.19.0'
}

subprojects {
Expand Down
10 changes: 5 additions & 5 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:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -70,11 +70,11 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.10.1"
implementation "androidx.fragment:fragment-ktx:1.5.7"
implementation "androidx.fragment:fragment-ktx:1.6.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
implementation "androidx.navigation:navigation-fragment-ktx:2.5.3"
implementation "androidx.navigation:navigation-ui-ktx:2.5.3"
implementation "androidx.navigation:navigation-fragment-ktx:2.6.0"
implementation "androidx.navigation:navigation-ui-ktx:2.6.0"
implementation "androidx.recyclerview:recyclerview:1.3.0"
implementation "androidx.room:room-runtime:2.5.1"
implementation "androidx.room:room-ktx:2.5.1"
Expand Down Expand Up @@ -107,7 +107,7 @@ dependencies {
androidTestImplementation "androidx.test.ext:junit:1.1.5"
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
androidTestImplementation "androidx.work:work-testing:2.8.1"
androidTestImplementation "com.google.truth:truth:1.1.3"
androidTestImplementation "com.google.truth:truth:1.1.4"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
testImplementation "junit:junit:4.13.2"
}
6 changes: 3 additions & 3 deletions MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.0.1"
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
}
}

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

allprojects {
Expand Down
6 changes: 3 additions & 3 deletions 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:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -94,8 +94,8 @@ dependencies {
implementation "androidx.compose.foundation:foundation"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.navigation:navigation-compose:2.5.3"
implementation "androidx.activity:activity-compose:1.7.2"
implementation "androidx.navigation:navigation-compose:2.6.0"
debugImplementation "androidx.compose.ui:ui-tooling"

// Testing dependencies
Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.0.1"
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

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

subprojects {
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:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
8 changes: 4 additions & 4 deletions TestingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ buildscript {

// App dependencies
appCompatVersion = '1.6.1'
activityComposeVersion = '1.7.1'
activityComposeVersion = '1.7.2'
composeCompilerVersion = '1.4.8'
coreTestingVersion = '2.2.0'
coroutinesVersion = "1.5.2"
espressoVersion = '3.5.1'
fragmentVersion = '1.5.7'
fragmentVersion = '1.6.0'
junitVersion = '4.13.1'
kotlinVersion = '1.8.22'
ktlintVersion = '0.48.2'
Expand All @@ -49,13 +49,13 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.0.1"
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}

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

subprojects {
Expand Down
6 changes: 3 additions & 3 deletions 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:2023.05.01')
def composeBom = platform('androidx.compose:compose-bom:2023.06.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -113,9 +113,9 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"

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

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1"
Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ buildscript {
}

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

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

subprojects {
Expand Down

0 comments on commit 8b7bc8a

Please sign in to comment.