Skip to content

Commit 1d6d818

Browse files
Merge pull request #20 from google-developer-training/renovate/main-all
Update all dependencies (main)
2 parents 5c2f327 + d2ed13c commit 1d6d818

File tree

6 files changed

+214
-142
lines changed

6 files changed

+214
-142
lines changed

app/build.gradle.kts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,19 @@
1515
*/
1616
plugins {
1717
id("com.android.application")
18-
id("com.google.devtools.ksp") version "1.9.0-1.0.13"
18+
id("com.google.devtools.ksp") version "2.1.0-1.0.29"
1919
id("org.jetbrains.kotlin.android")
20+
id("org.jetbrains.kotlin.plugin.compose")
2021
}
2122

2223
android {
2324
namespace = "com.example.busschedule"
24-
compileSdk = 34
25+
compileSdk = 35
2526

2627
defaultConfig {
2728
applicationId = "com.example.busschedule"
2829
minSdk = 24
29-
targetSdk = 34
30+
targetSdk = 35
3031
versionCode = 1
3132
versionName = "1.0"
3233

@@ -55,9 +56,6 @@ android {
5556
buildFeatures {
5657
compose = true
5758
}
58-
composeOptions {
59-
kotlinCompilerExtensionVersion = "1.5.3"
60-
}
6159
packaging {
6260
resources {
6361
excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -67,14 +65,14 @@ android {
6765

6866
dependencies {
6967

70-
implementation(platform("androidx.compose:compose-bom:2023.05.01"))
71-
implementation("androidx.activity:activity-compose:1.7.2")
68+
implementation(platform("androidx.compose:compose-bom:2024.11.00"))
69+
implementation("androidx.activity:activity-compose:1.9.3")
7270
implementation("androidx.compose.material3:material3")
7371
implementation("androidx.compose.ui:ui")
7472
implementation("androidx.compose.ui:ui-graphics")
7573
implementation("androidx.compose.ui:ui-tooling-preview")
76-
implementation("androidx.core:core-ktx:1.10.1")
77-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
74+
implementation("androidx.core:core-ktx:1.15.0")
75+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
7876
implementation("androidx.navigation:navigation-compose:${rootProject.extra["nav_version"]}")
7977
implementation("androidx.room:room-ktx:${rootProject.extra["room_version"]}")
8078
implementation("androidx.room:room-runtime:${rootProject.extra["room_version"]}")

build.gradle.kts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1717
buildscript {
1818
extra.apply {
19-
set("nav_version", "2.5.3")
20-
set("room_version", "2.5.2")
19+
set("nav_version", "2.8.4")
20+
set("room_version", "2.6.1")
2121
}
2222
}
2323
plugins {
24-
id("com.android.application") version "8.1.1" apply false
25-
id("com.android.library") version "8.1.1" apply false
26-
id("org.jetbrains.kotlin.android") version "1.9.10" apply false
24+
id("com.android.application") version "8.7.3" apply false
25+
id("com.android.library") version "8.7.3" apply false
26+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
27+
id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
2728
}

gradle/wrapper/gradle-wrapper.jar

-15.3 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Mon Aug 14 19:18:37 PDT 2023
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)