Skip to content

Commit

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

* Update Kotlin to 1.9.20

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jolanda Verhoef <[email protected]>
  • Loading branch information
renovate[bot] and JolandaVerhoef authored Nov 20, 2023
1 parent 06f13f4 commit 15554fb
Show file tree
Hide file tree
Showing 16 changed files with 58 additions and 58 deletions.
12 changes: 6 additions & 6 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}

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

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -102,23 +102,23 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.8.0'
implementation 'androidx.activity:activity-ktx:1.8.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.activity:activity-compose:1.8.1"

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

implementation 'androidx.navigation:navigation-compose:2.7.4'
implementation 'androidx.navigation:navigation-compose:2.7.5'

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.3'
testImplementation 'org.robolectric:robolectric:4.11.1'
}

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,8 +21,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

Expand Down
10 changes: 5 additions & 5 deletions AdaptiveUiCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}
packagingOptions {
resources {
Expand All @@ -65,7 +65,7 @@ android {
dependencies {


def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -78,11 +78,11 @@ dependencies {

implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.activity:activity-compose:1.8.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.window:window:1.1.0"
implementation "androidx.window:window:1.2.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation "androidx.compose.material3:material3-window-size-class:1.2.0-alpha09"
implementation "androidx.compose.material3:material3-window-size-class:1.2.0-alpha11"

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 @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

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

composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}

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

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation "com.google.android.libraries.maps:maps:3.1.0-beta"
implementation "com.google.maps.android:maps-v3-ktx:3.4.0"
Expand All @@ -107,10 +107,10 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.activity:activity-compose:1.8.1"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -131,7 +131,7 @@ dependencies {
implementation "com.google.dagger:hilt-android:2.48.1"
kapt "com.google.dagger:hilt-compiler:2.48.1"

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

androidTestImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:core:1.5.0"
Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1"
}
}
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}
packagingOptions {
resources {
Expand All @@ -63,7 +63,7 @@ android {
}

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

Expand All @@ -75,7 +75,7 @@ dependencies {
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.10.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.activity:activity-compose:1.8.1'
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
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

Expand Down
20 changes: 10 additions & 10 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}
packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
Expand All @@ -61,29 +61,29 @@ android {
}

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

kapt "androidx.room:room-compiler:2.5.2"
kapt "androidx.room:room-compiler:2.6.0"
kapt "com.github.bumptech.glide:compiler:4.16.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.12.0"
implementation "androidx.fragment:fragment-ktx:1.6.1"
implementation "androidx.fragment:fragment-ktx:1.6.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
implementation "androidx.navigation:navigation-fragment-ktx:2.7.4"
implementation "androidx.navigation:navigation-ui-ktx:2.7.4"
implementation "androidx.recyclerview:recyclerview:1.3.1"
implementation "androidx.room:room-runtime:2.5.2"
implementation "androidx.room:room-ktx:2.5.2"
implementation "androidx.navigation:navigation-fragment-ktx:2.7.5"
implementation "androidx.navigation:navigation-ui-ktx:2.7.5"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation "androidx.room:room-runtime:2.6.0"
implementation "androidx.room:room-ktx:2.6.0"
implementation "androidx.viewpager2:viewpager2:1.0.0"
implementation "androidx.work:work-runtime-ktx:2.8.1"
implementation "com.github.bumptech.glide:glide:4.16.0"
implementation "com.google.android.material:material:1.10.0"
implementation "com.google.code.gson:gson:2.10.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"

Expand Down
6 changes: 3 additions & 3 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.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.4"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.5"
}
}

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

composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}

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

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
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.8.0"
implementation "androidx.navigation:navigation-compose:2.7.4"
implementation "androidx.activity:activity-compose:1.8.1"
implementation "androidx.navigation:navigation-compose:2.7.5"
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,8 +21,8 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

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.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
androidTestImplementation(composeBom)

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

// App dependencies
appCompatVersion = '1.6.1'
activityComposeVersion = '1.8.0'
composeCompilerVersion = '1.5.3'
activityComposeVersion = '1.8.1'
composeCompilerVersion = '1.5.4'
coreTestingVersion = '2.2.0'
coroutinesVersion = "1.5.2"
espressoVersion = '3.5.1'
fragmentVersion = '1.6.1'
fragmentVersion = '1.6.2'
junitVersion = '4.13.1'
kotlinVersion = '1.9.10'
kotlinVersion = '1.9.20'
ktlintVersion = '0.48.2'
ktxVersion = '1.12.0'
lifecycleVersion = '2.3.0'
Expand All @@ -49,7 +49,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
Expand Down
8 changes: 4 additions & 4 deletions ThemingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}

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

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -113,9 +113,9 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.8.0'
implementation 'androidx.activity:activity-ktx:1.8.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.activity:activity-compose:1.8.1"

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

dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

Expand Down

0 comments on commit 15554fb

Please sign in to comment.