Skip to content

Commit

Permalink
Merge pull request #382 from android/renovate/end-kotlin-dependencies
Browse files Browse the repository at this point in the history
Update Kotlin Dependencies (end)
  • Loading branch information
MagicalMeghan authored Sep 22, 2023
2 parents 71441e2 + e3c92f1 commit b449e75
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ dependencies {

implementation "com.google.android.material:material:1.9.0"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.7.2'
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildscript {

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

Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ dependencies {
implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.window:window:1.1.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation "androidx.compose.material3:material3-window-size-class:1.2.0-alpha02"

testImplementation 'junit:junit:4.13.2'
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
plugins {
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 'org.jetbrains.kotlin.android' version "1.9.10" apply false
}

task clean(type: Delete) {
Expand Down
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
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"
constraints {
Expand Down Expand Up @@ -139,7 +139,7 @@ dependencies {
androidTestImplementation "androidx.test:rules:1.5.0"
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 "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
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"
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/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.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.46.1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
plugins {
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 'org.jetbrains.kotlin.android' version '1.9.10' apply false
id 'com.diffplug.spotless' version '6.19.0'
}

Expand Down
6 changes: 3 additions & 3 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ dependencies {
implementation "com.github.bumptech.glide:glide:4.15.1"
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.22"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.0.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
}
}
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildscript {

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

Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ buildscript {
espressoVersion = '3.5.1'
fragmentVersion = '1.6.0'
junitVersion = '4.13.1'
kotlinVersion = '1.8.22'
kotlinVersion = '1.9.10'
ktlintVersion = '0.48.2'
ktxVersion = '1.10.1'
lifecycleVersion = '2.3.0'
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ dependencies {
androidTestImplementation "androidx.compose.ui:ui-test"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.7.2'
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildscript {

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

Expand Down

0 comments on commit b449e75

Please sign in to comment.