Skip to content

Commit a9a411c

Browse files
Merge pull request #23 from google-developer-training/renovate/all
Update all dependencies
2 parents 554e17c + c820f1b commit a9a411c

File tree

6 files changed

+210
-138
lines changed

6 files changed

+210
-138
lines changed

app/build.gradle.kts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
plugins {
1717
id("com.android.application")
1818
id("org.jetbrains.kotlin.android")
19+
id("org.jetbrains.kotlin.plugin.compose")
1920
}
2021

2122
android {
2223
namespace = "com.example.superheroes"
23-
compileSdk = 34
24+
compileSdk = 35
2425

2526
defaultConfig {
2627
applicationId = "com.example.superheroes"
2728
minSdk = 24
28-
targetSdk = 34
29+
targetSdk = 35
2930
versionCode = 1
3031
versionName = "1.0"
3132

@@ -54,9 +55,6 @@ android {
5455
buildFeatures {
5556
compose = true
5657
}
57-
composeOptions {
58-
kotlinCompilerExtensionVersion = "1.5.3"
59-
}
6058
packaging {
6159
resources {
6260
excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -65,11 +63,11 @@ android {
6563
}
6664

6765
dependencies {
68-
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
69-
implementation("androidx.activity:activity-compose:1.8.0")
66+
implementation(platform("androidx.compose:compose-bom:2024.11.00"))
67+
implementation("androidx.activity:activity-compose:1.9.3")
7068
implementation("androidx.compose.material3:material3")
7169
implementation("androidx.compose.ui:ui")
7270
implementation("androidx.compose.ui:ui-tooling-preview")
73-
implementation("androidx.core:core-ktx:1.12.0")
71+
implementation("androidx.core:core-ktx:1.15.0")
7472
debugImplementation("androidx.compose.ui:ui-tooling")
7573
}

build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818
plugins {
19-
id("com.android.application") version "8.1.3" apply false
20-
id("com.android.library") version "8.1.3" apply false
21-
id("org.jetbrains.kotlin.android") version "1.9.10" apply false
19+
id("com.android.application") version "8.7.3" apply false
20+
id("com.android.library") version "8.7.3" apply false
21+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
22+
id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
2223
}

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-
#Thu Mar 09 16:31:19 PST 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)