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 all dependencies (main) #497

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Update all dependencies (main) #497

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
18b8f7b
Update all dependencies
renovate[bot] Oct 31, 2024
d8313ce
Update compileSdk to 35
JolandaVerhoef Nov 6, 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
20 changes: 10 additions & 10 deletions AccessibilityCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace 'com.example.jetnews'
compileSdkVersion 34
compileSdkVersion 35
defaultConfig {
applicationId 'com.example.jetnews'
minSdkVersion 21
Expand Down Expand Up @@ -87,7 +87,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2024.09.03')
def composeBom = platform('androidx.compose:compose-bom:2024.10.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -114,16 +114,16 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"

implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-ktx:1.9.2'
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.activity:activity-compose:1.9.2"
implementation 'androidx.activity:activity-ktx:1.9.3'
implementation 'androidx.core:core-ktx:1.15.0'
implementation "androidx.activity:activity-compose:1.9.3"

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

implementation 'androidx.navigation:navigation-compose:2.8.2'
implementation 'androidx.navigation:navigation-compose:2.8.3'

androidTestImplementation 'androidx.test:rules:1.6.1'
androidTestImplementation 'androidx.test:runner:1.6.2'
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 @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.7.0'
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
}
}
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace = "com.example.reply"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.example.reply"
Expand Down
10 changes: 5 additions & 5 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
androidGradlePlugin = "8.7.0"
composeBom = "2024.09.03"
coreKtx = "1.13.1"
activityCompose = "1.9.2"
androidGradlePlugin = "8.7.2"
composeBom = "2024.10.01"
coreKtx = "1.15.0"
activityCompose = "1.9.3"
espressoCore = "3.6.1"
junit = "4.13.2"
junitVersion = "1.2.1"
kotlin = "2.0.20"
kotlinxCoroutinesAndroid = "1.8.1"
lifecycle = "2.8.6"
lifecycle = "2.8.7"
window = "1.3.0"

[libraries]
Expand Down
8 changes: 4 additions & 4 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if (rootProject.file("local.properties").exists()) {

android {
namespace "androidx.compose.samples.crane"
compileSdkVersion 34
compileSdkVersion 35
defaultConfig {
applicationId "androidx.compose.samples.crane"
minSdkVersion 21
Expand Down Expand Up @@ -103,11 +103,11 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.9.2"
implementation "androidx.activity:activity-compose:1.9.3"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.tracing:tracing:1.2.0"

def composeBom = platform('androidx.compose:compose-bom:2024.09.03')
def composeBom = platform('androidx.compose:compose-bom:2024.10.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -120,7 +120,7 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"

def lifecycle_version = "2.8.6"
def lifecycle_version = "2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.52"
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 @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.7.0"
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
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 @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.7.0'
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
}
Expand Down
8 changes: 4 additions & 4 deletions AnimationCodelab/finished/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace "com.example.android.codelab.animation"
compileSdk 34
compileSdk 35
defaultConfig {
applicationId 'com.example.android.codelab.animation'
minSdkVersion 21
Expand All @@ -43,11 +43,11 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.9.2'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.activity:activity-compose:1.9.3'
implementation 'androidx.core:core-ktx:1.15.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
8 changes: 4 additions & 4 deletions AnimationCodelab/start/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace "com.example.android.codelab.animation"
compileSdk 34
compileSdk 35
defaultConfig {
applicationId 'com.example.android.codelab.animation'
minSdkVersion 21
Expand All @@ -43,11 +43,11 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.9.2'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.activity:activity-compose:1.9.3'
implementation 'androidx.core:core-ktx:1.15.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
Expand Down
12 changes: 6 additions & 6 deletions BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace "com.codelab.basiclayouts"
compileSdk 34
compileSdk 35

defaultConfig {
applicationId "com.codelab.basiclayouts"
Expand Down Expand Up @@ -61,19 +61,19 @@ android {
}

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

implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.core:core-ktx:1.15.0'
implementation "androidx.compose.ui:ui"
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.0'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.1'
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.12.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
implementation 'androidx.activity:activity-compose:1.9.2'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
implementation 'androidx.activity:activity-compose:1.9.3'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
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 @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.7.0"
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
}
Expand Down
14 changes: 7 additions & 7 deletions BasicStateCodelab/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace = "com.codelabs.state"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.codelabs.state"
Expand Down Expand Up @@ -64,19 +64,19 @@ android {
}

dependencies {
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6")
implementation("androidx.activity:activity-compose:1.9.2")
implementation(platform("androidx.compose:compose-bom:2024.09.03"))
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
implementation("androidx.activity:activity-compose:1.9.3")
implementation(platform("androidx.compose:compose-bom:2024.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.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.03"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.10.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
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 @@ -20,7 +20,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.7.0'
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
}
Expand Down
12 changes: 6 additions & 6 deletions BasicsCodelab/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {

android {
namespace = "com.codelab.basics"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.codelab.basics"
Expand Down Expand Up @@ -64,10 +64,10 @@ android {
}

dependencies {
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
implementation("androidx.activity:activity-compose:1.9.2")
implementation(platform("androidx.compose:compose-bom:2024.09.03"))
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.activity:activity-compose:1.9.3")
implementation(platform("androidx.compose:compose-bom:2024.10.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -76,7 +76,7 @@ dependencies {
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.03"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.10.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
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 @@ -16,7 +16,7 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.7.0" apply false
id("com.android.application") version "8.7.2" apply false
id("org.jetbrains.kotlin.android") version "2.0.20" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.0.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 @@ -22,7 +22,7 @@ apply plugin: 'org.jetbrains.kotlin.plugin.compose'


android {
compileSdkVersion 34
compileSdkVersion 35
namespace "com.google.samples.apps.sunflower"
defaultConfig {
applicationId "com.google.samples.apps.sunflower"
Expand Down Expand Up @@ -60,26 +60,26 @@ android {
}

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

kapt "androidx.room:room-compiler:2.6.1"
kapt "com.github.bumptech.glide:compiler:4.16.0"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.13.1"
implementation "androidx.fragment:fragment-ktx:1.8.4"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6"
implementation "androidx.navigation:navigation-fragment-ktx:2.8.2"
implementation "androidx.navigation:navigation-ui-ktx:2.8.2"
implementation "androidx.constraintlayout:constraintlayout:2.2.0"
implementation "androidx.core:core-ktx:1.15.0"
implementation "androidx.fragment:fragment-ktx:1.8.5"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
implementation "androidx.navigation:navigation-fragment-ktx:2.8.3"
implementation "androidx.navigation:navigation-ui-ktx:2.8.3"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation "androidx.room:room-runtime:2.6.1"
implementation "androidx.room:room-ktx:2.6.1"
implementation "androidx.tracing:tracing:1.2.0"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.9.1"
implementation "androidx.work:work-runtime-ktx:2.10.0"
implementation "com.github.bumptech.glide:glide:4.16.0"
implementation "com.google.android.material:material:1.12.0"
implementation "com.google.code.gson:gson:2.11.0"
Expand All @@ -103,7 +103,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-intents:3.6.1"
androidTestImplementation "androidx.test.ext:junit:1.2.1"
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
androidTestImplementation "androidx.work:work-testing:2.9.1"
androidTestImplementation "androidx.work:work-testing:2.10.0"
androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1"
androidTestImplementation "com.google.truth:truth:1.4.4"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
Expand Down
4 changes: 2 additions & 2 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.7.0"
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.2"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
}
}
Expand Down
Loading
Loading