Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Kotlin Dependencies (main) #380

Merged
merged 1 commit into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ dependencies {
implementation "com.google.accompanist:accompanist-insets:$accompanist_version"
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"

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"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUICodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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 @@ -137,7 +137,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 AnimationCodelab/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"
}
}

Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ buildscript {
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
2 changes: 1 addition & 1 deletion BasicStateCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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
2 changes: 1 addition & 1 deletion BasicStateCodelab/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") 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
}
2 changes: 1 addition & 1 deletion BasicsCodelab/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") 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
}
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/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ dependencies {
implementation "androidx.core:core-ktx:1.10.1"
implementation "com.google.android.material:material:1.9.0"
implementation "androidx.fragment:fragment-ktx:1.6.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/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 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
2 changes: 1 addition & 1 deletion ThemingCodelabM2/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"
}
}

Expand Down
Loading