Skip to content

Update Kotlin Dependencies (end) #427

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

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Update Kotlin Dependencies (end) #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a24da4e
Update Kotlin Dependencies
renovate[bot] May 21, 2024
e6c7036
Use Compose compiler to fix kotlin 2.0 issue
mlykotom Jun 14, 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
7 changes: 2 additions & 5 deletions AccessibilityCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
Expand Down Expand Up @@ -62,10 +63,6 @@ android {
compose true
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.13'
}

packagingOptions {
excludes += "/META-INF/AL2.0"
excludes += "/META-INF/LGPL2.1"
Expand Down Expand Up @@ -99,7 +96,7 @@ dependencies {

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

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.9.0'
Expand Down
3 changes: 2 additions & 1 deletion AccessibilityCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:8.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
}
}

plugins {
id 'com.diffplug.spotless' version '6.25.0'
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 2 additions & 4 deletions AdaptiveUiCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
Expand Down Expand Up @@ -52,9 +53,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.13'
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand All @@ -81,7 +79,7 @@ dependencies {
implementation 'androidx.activity:activity-compose:1.9.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.window:window:1.2.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
implementation "androidx.compose.material3:material3-window-size-class:1.2.1"

testImplementation 'junit:junit:4.13.2'
Expand Down
3 changes: 2 additions & 1 deletion AdaptiveUiCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 3 additions & 6 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ plugins {
id 'kotlin-android'
id 'kotlin-kapt'
id 'dagger.hilt.android.plugin'
id 'org.jetbrains.kotlin.plugin.compose'
}

// Reads the Google maps key that is used in the AndroidManifest
Expand Down Expand Up @@ -83,10 +84,6 @@ android {
shaders false
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.13'
}

packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
// our test APK to build (has no effect on our AARs)
Expand All @@ -96,7 +93,7 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.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 @@ -138,7 +135,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.8.0"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1"
androidTestImplementation "com.google.dagger:hilt-android:2.51.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.51.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.51.1"
Expand Down
3 changes: 2 additions & 1 deletion AdvancedStateAndSideEffectsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 1 addition & 3 deletions BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
Expand Down Expand Up @@ -52,9 +53,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.13'
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand Down
3 changes: 2 additions & 1 deletion BasicLayoutsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 4 additions & 5 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'androidx.navigation.safeargs.kotlin'
apply plugin: 'org.jetbrains.kotlin.plugin.compose'


android {
compileSdkVersion 34
Expand Down Expand Up @@ -49,9 +51,6 @@ android {
dataBinding true
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.13'
}
packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
// our test APK to build (has no effect on our AARs)
Expand Down Expand Up @@ -83,8 +82,8 @@ dependencies {
implementation "com.github.bumptech.glide:glide:4.16.0"
implementation "com.google.android.material:material:1.11.0"
implementation "com.google.code.gson:gson:2.10.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
3 changes: 2 additions & 1 deletion MigrationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
Expand Down Expand Up @@ -69,7 +70,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.13'
kotlinCompilerExtensionVersion '1.5.14'
}

packagingOptions {
Expand Down
3 changes: 2 additions & 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,8 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions PerformanceCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
coil = "2.6.0"
com-android-application = "8.3.2"
desugar_jdk_libs = "2.0.4"
kotlinx-datetime = "0.5.0"
kotlinx-datetime = "0.6.0"
lifecycle-viewmodel-compose = "2.7.0"
material-icons-core = "1.6.6"
media3 = "1.3.1"
org-jetbrains-kotlin-android = "2.0.0-RC2"
org-jetbrains-kotlin-android = "2.0.0"
core-ktx = "1.13.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.1.5"
Expand Down
2 changes: 1 addition & 1 deletion PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue May 16 11:33:31 AEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 1 addition & 4 deletions TestingCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
Expand Down Expand Up @@ -75,10 +76,6 @@ android {
shaders false
}

composeOptions {
kotlinCompilerExtensionVersion rootProject.composeCompilerVersion
}

packagingOptions {
exclude "META-INF/licenses/**"
exclude "META-INF/AL2.0"
Expand Down
4 changes: 2 additions & 2 deletions TestingCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ buildscript {
// App dependencies
appCompatVersion = '1.6.1'
activityComposeVersion = '1.9.0'
composeCompilerVersion = '1.5.13'
coreTestingVersion = '2.2.0'
coroutinesVersion = "1.5.2"
espressoVersion = '3.5.1'
fragmentVersion = '1.7.0'
junitVersion = '4.13.1'
kotlinVersion = '1.9.23'
kotlinVersion = '2.0.0'
ktlintVersion = '0.48.2'
ktxVersion = '1.13.1'
lifecycleVersion = '2.3.0'
Expand All @@ -51,6 +50,7 @@ buildscript {
dependencies {
classpath "com.android.tools.build:gradle:8.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion"
}
}

Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 2 additions & 5 deletions ThemingCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
Expand Down Expand Up @@ -79,10 +80,6 @@ android {
compose true
}

composeOptions {
kotlinCompilerExtensionVersion '1.5.13'
}

packagingOptions {
excludes += "/META-INF/AL2.0"
excludes += "/META-INF/LGPL2.1"
Expand Down Expand Up @@ -110,7 +107,7 @@ dependencies {
androidTestImplementation "androidx.compose.ui:ui-test"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.9.0'
Expand Down
3 changes: 2 additions & 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,8 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:8.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down