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.

Sign up for GitHub

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

Jump to bottom

Update Kotlin Dependencies to v1.9.22 (main) #395

Merged
merged 4 commits into from
Jan 5, 2024
Merged

Update Kotlin Dependencies to v1.9.22 (main) #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
edb5abd
Update Kotlin Dependencies to v1.9.22
renovate[bot] Jan 5, 2024
386a474
Update kotlin gradle plugin version and kotlinComposeExtenstionVersion
MagicalMeghan Jan 5, 2024
3b798f8
remove kotlin-stdlib dependency
MagicalMeghan Jan 5, 2024
edd2f51
remove kotlin-stdlib dependency
MagicalMeghan Jan 5, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.4'
kotlinCompilerExtensionVersion '1.5.7'
}

packagingOptions {
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
View file
Open in desktop
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.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUICodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.4'
kotlinCompilerExtensionVersion '1.5.7'
}
packagingOptions {
resources {
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUICodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

Expand Down
3 changes: 1 addition & 2 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.4'
kotlinCompilerExtensionVersion '1.5.7'
}

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

dependencies {
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 Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/build.gradle
View file
Open in desktop
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.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/build.gradle
View file
Open in desktop
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.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

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

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

Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.4'
kotlinCompilerExtensionVersion '1.5.7'
}
packagingOptions {
resources {
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
View file
Open in desktop
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.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

Expand Down
2 changes: 1 addition & 1 deletion BasicStateCodelab/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ android {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.4"
kotlinCompilerExtensionVersion = "1.5.7"
}
packaging {
resources {
Expand Down
2 changes: 1 addition & 1 deletion BasicStateCodelab/build.gradle
View file
Open in desktop
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.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

Expand Down
2 changes: 1 addition & 1 deletion BasicsCodelab/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ android {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.4"
kotlinCompilerExtensionVersion = "1.5.7"
}
packaging {
resources {
Expand Down
2 changes: 1 addition & 1 deletion BasicsCodelab/build.gradle.kts
View file
Open in desktop
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.1.4" apply false
id("org.jetbrains.kotlin.android") version "1.9.20" apply false
id("org.jetbrains.kotlin.android") version "1.9.21" apply false
}
3 changes: 1 addition & 2 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.4'
kotlinCompilerExtensionVersion '1.5.7'
}
packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
Expand Down Expand Up @@ -83,7 +83,6 @@ dependencies {
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.20"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"

Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/build.gradle
View file
Open in desktop
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.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.5"
}
}
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.4'
kotlinCompilerExtensionVersion '1.5.7'
}

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

Expand Down
3 changes: 1 addition & 2 deletions TestingCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.4'
kotlinCompilerExtensionVersion '1.5.7'
}

packagingOptions {
Expand All @@ -95,7 +95,6 @@ dependencies {
implementation "androidx.core:core-ktx:1.12.0"
implementation "com.google.android.material:material:1.10.0"
implementation "androidx.fragment:fragment-ktx:1.6.2"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20"

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

Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.4'
kotlinCompilerExtensionVersion '1.5.7'
}

packagingOptions {
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/build.gradle
View file
Open in desktop
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.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

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

Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelabM2/build.gradle
View file
Open in desktop
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.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
}
}

Expand Down
Loading