Skip to content

Commit 1678583

Browse files
Merge pull request #81 from google-developer-training/renovate/compose-all
Update all dependencies (compose)
2 parents 6ad4df0 + f201d03 commit 1678583

File tree

6 files changed

+221
-148
lines changed

6 files changed

+221
-148
lines changed

app/build.gradle

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@
1717
plugins {
1818
id 'com.android.application'
1919
id 'org.jetbrains.kotlin.android'
20-
id 'kotlin-kapt'
20+
id 'com.google.devtools.ksp'
21+
id 'org.jetbrains.kotlin.plugin.compose'
2122
}
2223

2324
android {
2425
namespace 'com.example.sqldemo'
25-
compileSdk 32
26+
compileSdk 35
2627

2728
defaultConfig {
2829
applicationId "com.example.sqldemo"
2930
minSdk 21
30-
targetSdk 32
31+
targetSdk 35
3132
versionCode 1
3233
versionName "1.0"
3334

@@ -53,9 +54,6 @@ android {
5354
buildFeatures {
5455
compose true
5556
}
56-
composeOptions {
57-
kotlinCompilerExtensionVersion '1.1.1'
58-
}
5957
packagingOptions {
6058
resources {
6159
excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -64,22 +62,22 @@ android {
6462
}
6563

6664
dependencies {
67-
def room_version = '2.4.3'
65+
def room_version = '2.6.1'
6866

6967
implementation "androidx.room:room-runtime:$room_version"
70-
kapt "androidx.room:room-compiler:$room_version"
68+
ksp("androidx.room:room-compiler:$room_version")
7169
implementation "androidx.room:room-ktx:$room_version"
7270

73-
implementation 'androidx.core:core-ktx:1.7.0'
74-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
75-
implementation 'androidx.activity:activity-compose:1.3.1'
71+
implementation 'androidx.core:core-ktx:1.15.0'
72+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
73+
implementation 'androidx.activity:activity-compose:1.9.3'
7674
implementation "androidx.compose.ui:ui:$compose_ui_version"
7775
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
78-
implementation 'androidx.compose.material:material:1.1.1'
76+
implementation 'androidx.compose.material:material:1.7.5'
7977
testImplementation 'junit:junit:4.13.2'
80-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
81-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
78+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
79+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
8280
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
8381
debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
8482
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
85-
}
83+
}

build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616

1717
buildscript {
1818
ext {
19-
compose_ui_version = '1.1.1'
19+
compose_ui_version = '1.7.5'
2020
}
2121
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
2222
plugins {
23-
id 'com.android.application' version '7.3.1' apply false
24-
id 'com.android.library' version '7.3.1' apply false
25-
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
26-
}
23+
id 'com.android.application' version '8.7.3' apply false
24+
id 'com.android.library' version '8.7.3' apply false
25+
id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
26+
id 'com.google.devtools.ksp' version '2.1.0-1.0.29' apply false
27+
id 'org.jetbrains.kotlin.plugin.compose' version '2.1.0' apply false
28+
}

gradle/wrapper/gradle-wrapper.jar

-15.3 KB
Binary file not shown.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Tue Dec 20 23:43:44 PST 2022
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)