Skip to content

Commit 8c5d99b

Browse files
committed
build(Version): Adjust names for the version catalogue
1 parent 4f93321 commit 8c5d99b

File tree

5 files changed

+41
-29
lines changed

5 files changed

+41
-29
lines changed

.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/build
1+
/build
2+
/.idea/

app/build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
alias(libs.plugins.android.application)
3-
alias(libs.plugins.jetbrains.kotlin.android)
3+
alias(libs.plugins.kotlin.android)
44
}
55

66
android {
@@ -54,16 +54,16 @@ dependencies {
5454
implementation(libs.androidx.core.ktx)
5555
implementation(libs.androidx.lifecycle.runtime.ktx)
5656
implementation(libs.androidx.activity.compose)
57-
implementation(platform(libs.androidx.compose.bom))
58-
implementation(libs.androidx.ui)
59-
implementation(libs.androidx.ui.graphics)
60-
implementation(libs.androidx.ui.tooling.preview)
61-
implementation(libs.androidx.material3)
57+
implementation(platform(libs.compose.bom))
58+
implementation(libs.compose.ui)
59+
implementation(libs.compose.ui.graphics)
60+
implementation(libs.compose.ui.tooling.preview)
61+
implementation(libs.compose.material3)
6262
testImplementation(libs.junit)
6363
androidTestImplementation(libs.androidx.junit)
6464
androidTestImplementation(libs.androidx.espresso.core)
65-
androidTestImplementation(platform(libs.androidx.compose.bom))
66-
androidTestImplementation(libs.androidx.ui.test.junit4)
67-
debugImplementation(libs.androidx.ui.tooling)
68-
debugImplementation(libs.androidx.ui.test.manifest)
65+
androidTestImplementation(platform(libs.compose.bom))
66+
androidTestImplementation(libs.compose.ui.test.junit4)
67+
debugImplementation(libs.compose.ui.tooling)
68+
debugImplementation(libs.compose.ui.test.manifest)
6969
}

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
33
alias(libs.plugins.android.application) apply false
4-
alias(libs.plugins.jetbrains.kotlin.android) apply false
4+
alias(libs.plugins.kotlin.android) apply false
55
}

gradle/libs.versions.toml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
[versions]
2-
agp = "8.2.0"
2+
agp = "8.2.2"
33
kotlin = "1.9.0"
44
coreKtx = "1.12.0"
55
junit = "4.13.2"
66
junitVersion = "1.1.5"
77
espressoCore = "3.5.1"
88
lifecycleRuntimeKtx = "2.6.2"
99
activityCompose = "1.8.2"
10-
composeBom = "2023.08.00"
10+
composeBom = "2024.02.00"
1111

1212
[libraries]
13-
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
14-
junit = { group = "junit", name = "junit", version.ref = "junit" }
15-
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
16-
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
17-
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
18-
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
19-
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
20-
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
21-
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
22-
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
23-
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
24-
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
25-
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
26-
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
13+
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
14+
junit = { module = "junit:junit", version.ref = "junit" }
15+
androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
16+
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
17+
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
18+
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
19+
20+
compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
21+
compose-ui = { module = "androidx.compose.ui:ui" }
22+
compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
23+
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
24+
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
25+
compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
26+
compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
27+
compose-material3 = { module = "androidx.compose.material3:material3" }
2728

2829
[plugins]
2930
android-application = { id = "com.android.application", version.ref = "agp" }
30-
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
31+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3132

0 commit comments

Comments
 (0)