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

Update all dependencies (main) #393

Merged
merged 2 commits into from
Nov 20, 2023
Merged

Update all dependencies (main) #393

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
82891ba
Update all dependencies
renovate[bot] Nov 16, 2023
36e1ecd
Update Kotlin to 1.9.20
JolandaVerhoef Nov 20, 2023
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
12 changes: 6 additions & 6 deletions 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.3'
kotlinCompilerExtensionVersion '1.5.4'
}

packagingOptions {
Expand All @@ -90,7 +90,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -117,23 +117,23 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.8.0'
implementation 'androidx.activity:activity-ktx:1.8.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.activity:activity-compose:1.8.1"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"

implementation 'androidx.navigation:navigation-compose:2.7.4'
implementation 'androidx.navigation:navigation-compose:2.7.5'

androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation 'androidx.test:runner:1.5.2'

// TODO: Bump to latest after Espresso 3.5.0 goes stable
// (due to https://github.com/robolectric/robolectric/issues/6593)
testImplementation 'org.robolectric:robolectric:4.10.3'
testImplementation 'org.robolectric:robolectric:4.11.1'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

Expand Down
8 changes: 4 additions & 4 deletions 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.3'
kotlinCompilerExtensionVersion '1.5.4'
}
packagingOptions {
resources {
Expand All @@ -65,7 +65,7 @@ android {
dependencies {


def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -78,9 +78,9 @@ dependencies {

implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.activity:activity-compose:1.8.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.window:window:1.1.0"
implementation "androidx.window:window:1.2.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

testImplementation 'junit:junit:4.13.2'
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUICodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

Expand Down
10 changes: 5 additions & 5 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.3'
kotlinCompilerExtensionVersion '1.5.4'
}

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

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
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 All @@ -107,10 +107,10 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.activity:activity-compose:1.8.1"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -129,7 +129,7 @@ dependencies {
implementation "com.google.dagger:hilt-android:2.48.1"
kapt "com.google.dagger:hilt-compiler:2.48.1"

implementation "io.coil-kt:coil-compose:2.4.0"
implementation "io.coil-kt:coil-compose:2.5.0"

androidTestImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:core:1.5.0"
Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.48.1"
}
}
Expand Down
4 changes: 2 additions & 2 deletions AnimationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

Expand Down
6 changes: 3 additions & 3 deletions AnimationCodelab/finished/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ android {
jvmTarget = '1.8'
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.activity:activity-compose:1.8.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
Expand Down
6 changes: 3 additions & 3 deletions AnimationCodelab/start/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ android {
jvmTarget = '1.8'
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
kotlinCompilerExtensionVersion '1.5.4'
}
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.activity:activity-compose:1.8.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
Expand Down
6 changes: 3 additions & 3 deletions 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.3'
kotlinCompilerExtensionVersion '1.5.4'
}
packagingOptions {
resources {
Expand All @@ -63,7 +63,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -75,7 +75,7 @@ dependencies {
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.10.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.activity:activity-compose:1.8.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

Expand Down
8 changes: 4 additions & 4 deletions 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.3"
kotlinCompilerExtensionVersion = "1.5.4"
}
packaging {
resources {
Expand All @@ -69,16 +69,16 @@ dependencies {
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
implementation("androidx.activity:activity-compose:1.8.0")
implementation(platform("androidx.compose:compose-bom:2023.10.00"))
implementation("androidx.activity:activity-compose:1.8.1")
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
4 changes: 2 additions & 2 deletions BasicStateCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
}
}

Expand Down
8 changes: 4 additions & 4 deletions 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.3"
kotlinCompilerExtensionVersion = "1.5.4"
}
packaging {
resources {
Expand All @@ -68,8 +68,8 @@ android {
dependencies {
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
implementation("androidx.activity:activity-compose:1.8.0")
implementation(platform("androidx.compose:compose-bom:2023.10.00"))
implementation("androidx.activity:activity-compose:1.8.1")
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -78,7 +78,7 @@ dependencies {
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
4 changes: 2 additions & 2 deletions BasicsCodelab/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.1.2" apply false
id("org.jetbrains.kotlin.android") version "1.9.10" apply false
id("com.android.application") version "8.1.4" apply false
id("org.jetbrains.kotlin.android") version "1.9.20" apply false
}
22 changes: 11 additions & 11 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.3'
kotlinCompilerExtensionVersion '1.5.4'
}
packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
Expand All @@ -61,29 +61,29 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.10.00')
def composeBom = platform('androidx.compose:compose-bom:2023.10.01')
implementation(composeBom)
androidTestImplementation(composeBom)

kapt "androidx.room:room-compiler:2.5.2"
kapt "androidx.room:room-compiler:2.6.0"
kapt "com.github.bumptech.glide:compiler:4.16.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.12.0"
implementation "androidx.fragment:fragment-ktx:1.6.1"
implementation "androidx.fragment:fragment-ktx:1.6.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
implementation "androidx.navigation:navigation-fragment-ktx:2.7.4"
implementation "androidx.navigation:navigation-ui-ktx:2.7.4"
implementation "androidx.recyclerview:recyclerview:1.3.1"
implementation "androidx.room:room-runtime:2.5.2"
implementation "androidx.room:room-ktx:2.5.2"
implementation "androidx.navigation:navigation-fragment-ktx:2.7.5"
implementation "androidx.navigation:navigation-ui-ktx:2.7.5"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation "androidx.room:room-runtime:2.6.0"
implementation "androidx.room:room-ktx:2.6.0"
implementation "androidx.viewpager2:viewpager2:1.0.0"
implementation "androidx.work:work-runtime-ktx:2.8.1"
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.10"
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 All @@ -105,7 +105,7 @@ dependencies {
androidTestImplementation "androidx.test.ext:junit:1.1.5"
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
androidTestImplementation "androidx.work:work-testing:2.8.1"
androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.0.0"
androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.0"
androidTestImplementation "com.google.truth:truth:1.1.5"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
testImplementation "junit:junit:4.13.2"
Expand Down
6 changes: 3 additions & 3 deletions MigrationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.4"
classpath "com.android.tools.build:gradle:8.1.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.5"
}
}

Expand Down
Loading
Loading