Skip to content

Commit 6324dba

Browse files
committed
using version catolog
1 parent 081a71a commit 6324dba

File tree

4 files changed

+63
-31
lines changed

4 files changed

+63
-31
lines changed

app/build.gradle.kts

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("com.android.application")
3-
id("org.jetbrains.kotlin.android")
2+
alias(libs.plugins.agp.app)
3+
alias(libs.plugins.kotlin.android)
44
}
55

66
android {
@@ -51,19 +51,19 @@ android {
5151

5252
dependencies {
5353
implementation(project(":dragdrop"))
54-
implementation("androidx.core:core-ktx:1.9.0")
55-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
56-
implementation("androidx.activity:activity-compose:1.7.2")
57-
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
58-
implementation("androidx.compose.ui:ui")
59-
implementation("androidx.compose.ui:ui-graphics")
60-
implementation("androidx.compose.ui:ui-tooling-preview")
61-
implementation("androidx.compose.material3:material3")
62-
testImplementation("junit:junit:4.13.2")
63-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
64-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
65-
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
66-
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
67-
debugImplementation("androidx.compose.ui:ui-tooling")
68-
debugImplementation("androidx.compose.ui:ui-test-manifest")
54+
implementation(libs.androidx.core.ktx)
55+
implementation(libs.androidx.lifecycle.runtime.ktx)
56+
implementation(libs.androidx.activity.compose)
57+
implementation(platform(libs.androidx.compose.bom))
58+
implementation(libs.androidx.compose.ui)
59+
implementation(libs.androidx.compose.ui.graphics)
60+
implementation(libs.androidx.compose.ui.tooling.preview)
61+
implementation(libs.androidx.compose.material3)
62+
testImplementation(libs.junit)
63+
androidTestImplementation(libs.androidx.test.ext.junit)
64+
androidTestImplementation(libs.androidx.test.espresso.core)
65+
androidTestImplementation(platform(libs.androidx.compose.bom))
66+
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
67+
debugImplementation(libs.androidx.compose.ui.tooling)
68+
debugImplementation(libs.androidx.compose.ui.test.manifest)
6969
}

build.gradle.kts

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
buildscript {
2-
val agp_version by extra("8.0.2")
3-
}
41
// Top-level build file where you can add configuration options common to all sub-projects/modules.
52
plugins {
6-
id("com.android.application") version "8.3.0" apply false
7-
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
8-
id("com.android.library") version "8.3.0" apply false
9-
id("com.vanniktech.maven.publish") version "0.28.0" apply false
3+
alias(libs.plugins.agp.app) apply false
4+
alias(libs.plugins.agp.lib) apply false
5+
alias(libs.plugins.kotlin.android) apply false
6+
alias(libs.plugins.maven.publish) apply false
107
}

dragdrop/build.gradle.kts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
4-
id("com.vanniktech.maven.publish")
2+
alias(libs.plugins.agp.lib)
3+
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.maven.publish)
55
}
66

77
android {
@@ -30,7 +30,7 @@ android {
3030
}
3131

3232
composeOptions {
33-
kotlinCompilerExtensionVersion = "1.5.1"
33+
kotlinCompilerExtensionVersion = "1.5.2"
3434
}
3535

3636
compileOptions {
@@ -43,7 +43,7 @@ android {
4343
}
4444

4545
dependencies {
46-
implementation(platform("androidx.compose:compose-bom:2023.08.00"))
47-
implementation("androidx.compose.ui:ui")
48-
implementation("androidx.compose.foundation:foundation")
46+
implementation(platform(libs.androidx.compose.bom))
47+
implementation(libs.androidx.compose.ui)
48+
implementation(libs.androidx.compose.foundation)
4949
}

gradle/libs.versions.toml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[versions]
2+
core-ktx = "1.9.0"
3+
lifecycle-runtime-ktx = "2.6.1"
4+
activity-compose = "1.7.2"
5+
compose-bom = "2024.03.00"
6+
junit = "4.13.2"
7+
androidx-junit = "1.1.5"
8+
espresso-core = "3.5.1"
9+
# plugins
10+
agp = "8.3.0"
11+
kotlin = "1.9.0"
12+
maven-publish = "0.28.0"
13+
14+
[libraries]
15+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
16+
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
17+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
18+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
19+
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
20+
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
21+
androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
22+
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
23+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
24+
junit = { group = "junit", name = "junit", version.ref = "junit" }
25+
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-junit" }
26+
androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
27+
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
28+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
29+
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
30+
31+
[plugins]
32+
agp-app = { id = "com.android.application", version.ref = "agp" }
33+
agp-lib = { id = "com.android.library", version.ref = "agp" }
34+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
35+
maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish" }

0 commit comments

Comments
 (0)