Skip to content

Commit

Permalink
Merge pull request #359 from android/renovate/main-kotlin-dependencies
Browse files Browse the repository at this point in the history 
Update Kotlin Dependencies (main)
  • Loading branch information
@mlykotom
mlykotom authored Jul 25, 2023
2 parents 98d443a + 8f7a114 commit c644b25
Show file tree
Hide file tree
Showing 25 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 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.8'
}

packagingOptions {
Expand Down 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.6.4"
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'
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
View file
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.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

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.8'
}
packagingOptions {
resources {
Expand Down Expand Up @@ -81,9 +81,9 @@ dependencies {
implementation 'androidx.activity:activity-compose:1.7.1'
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"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
}
2 changes: 1 addition & 1 deletion AdaptiveUICodelab/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
plugins {
id 'com.android.application' version "8.0.1" apply false
id 'com.android.library' version "8.0.1" apply false
id 'org.jetbrains.kotlin.android' version "1.8.20" apply false
id 'org.jetbrains.kotlin.android' version "1.8.22" apply false
}

task clean(type: Delete) {
Expand Down
8 changes: 4 additions & 4 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.8'
}

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

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
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.6.4"
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"
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/build.gradle
View file
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.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.46"
}
}
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/build.gradle
View file
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.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/finished/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ android {
jvmTarget = '1.8'
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.8'
}
}

Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/start/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ android {
jvmTarget = '1.8'
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.8'
}
}

Expand Down
4 changes: 2 additions & 2 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.8'
}
packagingOptions {
resources {
Expand All @@ -80,4 +80,4 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
debugImplementation "androidx.compose.ui:ui-tooling"
}
}
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
View file
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.1' apply false
id 'com.android.library' version '8.0.1' apply false
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
id 'com.diffplug.spotless' version '6.18.0'
}

Expand Down
2 changes: 1 addition & 1 deletion 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.8'
}
packagingOptions {
resources {
Expand Down
2 changes: 1 addition & 1 deletion BasicStateCodelab/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
plugins {
id 'com.android.application' version '8.0.1' apply false
id 'com.android.library' version '8.0.1' apply false
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
id 'com.diffplug.spotless' version '6.18.0'
}

Expand Down
2 changes: 1 addition & 1 deletion BasicsCodelab/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion "1.4.6"
kotlinCompilerExtensionVersion '1.4.8'
}
}

Expand Down
2 changes: 1 addition & 1 deletion BasicsCodelab/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
plugins {
id 'com.android.application' version '8.0.1' apply false
id 'com.android.library' version '8.0.1' apply false
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
}
10 changes: 5 additions & 5 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.8'
}
packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
Expand Down 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.20"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
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"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand All @@ -111,4 +111,4 @@ dependencies {
androidTestImplementation "com.google.truth:truth:1.1.3"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
testImplementation "junit:junit:4.13.2"
}
}
2 changes: 1 addition & 1 deletion MigrationCodelab/build.gradle
View file
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.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
}
}
Expand Down
2 changes: 1 addition & 1 deletion 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.8'
}

packagingOptions {
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/build.gradle
View file
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.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

Expand Down
4 changes: 2 additions & 2 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.8'
}

packagingOptions {
Expand All @@ -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.5.7"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/build.gradle
View file
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.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelab/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.8'
}

packagingOptions {
Expand Down 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.6.4"
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'
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/build.gradle
View file
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.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelabM2/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.6'
kotlinCompilerExtensionVersion '1.4.8'
}
}

Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelabM2/build.gradle
View file
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.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

Expand Down

0 comments on commit c644b25

Please sign in to comment.