Skip to content

Commit a6f7df0

Browse files
committed
Address feedback
1 parent 86ad58b commit a6f7df0

3 files changed

Lines changed: 25 additions & 9 deletions

File tree

app/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ android {
5757
compose = true
5858
}
5959
composeOptions {
60-
kotlinCompilerExtensionVersion = "1.4.3"
60+
kotlinCompilerExtensionVersion = "1.4.7"
6161
}
62-
packagingOptions {
62+
packaging {
6363
resources {
6464
excludes += "/META-INF/{AL2.0,LGPL2.1}"
6565
}
@@ -68,24 +68,24 @@ android {
6868

6969
dependencies {
7070

71-
implementation(platform("androidx.compose:compose-bom:2022.10.00"))
71+
implementation(platform("androidx.compose:compose-bom:2023.06.00"))
7272
implementation("androidx.activity:activity-compose:1.7.2")
73+
implementation("androidx.compose.material:material-icons-extended")
7374
implementation("androidx.compose.material3:material3")
7475
implementation("androidx.compose.material3:material3-window-size-class")
75-
implementation("androidx.compose.material:material-icons-extended")
7676
implementation("androidx.compose.ui:ui")
7777
implementation("androidx.compose.ui:ui-graphics")
7878
implementation("androidx.compose.ui:ui-tooling-preview")
7979
implementation("androidx.core:core-ktx:1.10.1")
8080
implementation("androidx.lifecycle:lifecycle-runtime-ktx:${rootProject.extra["lifecycle_version"]}")
8181
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:${rootProject.extra["lifecycle_version"]}")
8282

83-
androidTestImplementation(platform("androidx.compose:compose-bom:2022.10.00"))
83+
androidTestImplementation(platform("androidx.compose:compose-bom:2023.06.00"))
8484
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
8585
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
8686
androidTestImplementation("androidx.test.ext:junit:1.1.5")
8787
testImplementation("junit:junit:4.13.2")
8888

8989
debugImplementation("androidx.compose.ui:ui-test-manifest")
9090
debugImplementation("androidx.compose.ui:ui-tooling")
91-
}
91+
}

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
buildscript {
1717
extra.apply {
18-
set("lifecycle_version", "2.6.0")
18+
set("lifecycle_version", "2.6.1")
1919
}
2020
}
2121

2222
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2323
plugins {
2424
id("com.android.application") version "8.0.2" apply false
2525
id("com.android.library") version "8.0.2" apply false
26-
id("org.jetbrains.kotlin.android") version "1.8.10" apply false
27-
}
26+
id("org.jetbrains.kotlin.android") version "1.8.21" apply false
27+
}

settings.gradle.kts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright (C) 2023 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
pluginManagement {
218
repositories {
319
google()

0 commit comments

Comments
 (0)