Skip to content

Commit 8f6a335

Browse files
syslogicsyslogic
committed
migrated to version catalog.
1 parent bc7ef8e commit 8f6a335

File tree

5 files changed

+69
-58
lines changed

5 files changed

+69
-58
lines changed

Diff for: ‎gradle/libs.versions.toml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
[versions]
2+
android_gradle_plugin = '8.3.1'
3+
material_design = '1.11.0'
4+
junit = '4.13.2'
5+
kotlin = '1.9.23'
6+
kotlin_compiler_extension = '1.5.11'
7+
androidx_compose_bom = '2024.03.00'
8+
androidx_compose_uitest = '1.6.4'
9+
androidx_core = '1.12.0'
10+
androidx_appcompat = '1.6.1'
11+
androidx_navigation = '2.7.7'
12+
androidx_preference = '1.2.1'
13+
androidx_test_junit = '1.1.5'
14+
androidx_test_core = '1.5.0'
15+
androidx_test_rules = '1.5.0'
16+
androidx_test_runner = '1.5.2'
17+
androidx_test_monitor = '1.6.1'
18+
androidx_test_espresso = '3.5.1'
19+
androidx_test_uiautomator = '2.3.0'
20+
21+
[plugins]
22+
android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }
23+
android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }
24+
androidx_navigation_safeargs = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" }
25+
kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
26+
27+
[libraries]
28+
kotlin_stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
29+
material_design = { module = "com.google.android.material:material", version.ref = "material_design" }
30+
junit = { module = "junit:junit", version.ref = "junit" }
31+
androidx_core_ktx = { module = "androidx.core:core-ktx", version.ref = "androidx_core" }
32+
androidx_appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx_appcompat" }
33+
androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "androidx_compose_bom" }
34+
androidx_compose_uitest = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx_compose_uitest" }
35+
androidx_preference_ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx_preference" }
36+
androidx_navigation_testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidx_navigation" }
37+
androidx_navigation_runtime_ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "androidx_navigation" }
38+
androidx_navigation_fragment_ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx_navigation" }
39+
androidx_navigation_ui_ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx_navigation" }
40+
androidx_test_monitor = { module = "androidx.test:monitor", version.ref = "androidx_test_monitor" }
41+
androidx_test_junit = { module = "androidx.test.ext:junit", version.ref = "androidx_test_junit" }
42+
androidx_test_core = { module = "androidx.test:core", version.ref = "androidx_test_core" }
43+
androidx_test_rules = { module = "androidx.test:rules", version.ref = "androidx_test_rules" }
44+
androidx_test_runner = { module = "androidx.test:runner", version.ref = "androidx_test_runner" }
45+
androidx_test_uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx_test_uiautomator" }
46+
androidx_espresso_core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
47+
androidx_espresso_web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }
48+
androidx_espresso_idling_resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "androidx_test_espresso" }
49+
androidx_espresso_idling_concurrent = { module = "androidx.test.espresso.idling:idling-concurrent", version.ref = "androidx_test_espresso" }
50+
androidx_espresso_contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx_test_espresso" }
51+
androidx_espresso_intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidx_test_espresso" }
52+
androidx_espresso_accessibility = { module = "androidx.test.espresso:espresso-accessibility", version.ref = "androidx_test_espresso" }

Diff for: ‎library/build.gradle

+5
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,17 @@ dependencies {
9494
implementation platform(libs.androidx.compose.bom)
9595
// implementation "androidx.compose.material:material-icons-core"
9696
// implementation "androidx.compose.material:material-icons-extended"
97+
//noinspection UseTomlInstead
9798
implementation "androidx.compose.foundation:foundation"
99+
//noinspection UseTomlInstead
98100
implementation "androidx.compose.material:material"
101+
//noinspection UseTomlInstead
99102
implementation "androidx.compose.ui:ui"
100103

101104
/* Composable Preview */
105+
//noinspection UseTomlInstead
102106
debugImplementation "androidx.customview:customview-poolingcontainer"
107+
//noinspection UseTomlInstead
103108
debugImplementation "androidx.compose.ui:ui-tooling"
104109
}
105110

Diff for: ‎libs.versions.toml

-47
This file was deleted.

Diff for: ‎mobile/build.gradle

+12-6
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,17 @@ dependencies {
8383
// https://mvnrepository.com/artifact/androidx.compose
8484
// https://developer.android.com/jetpack/compose/tooling#bom
8585
implementation platform(libs.androidx.compose.bom)
86+
//noinspection UseTomlInstead
8687
debugImplementation "androidx.compose.ui:ui-tooling-preview"
88+
//noinspection UseTomlInstead
8789
implementation "androidx.activity:activity-compose"
90+
//noinspection UseTomlInstead
8891
implementation "androidx.compose.foundation:foundation"
92+
//noinspection UseTomlInstead
8993
implementation "androidx.compose.material:material"
94+
//noinspection UseTomlInstead
9095
implementation "androidx.compose.runtime:runtime"
96+
//noinspection UseTomlInstead
9197
implementation "androidx.compose.ui:ui"
9298

9399
// jUnit
@@ -113,20 +119,20 @@ dependencies {
113119
// Espresso
114120
androidTestImplementation libs.androidx.espresso.core
115121
androidTestImplementation libs.androidx.espresso.web
116-
// androidTestImplementation "androidx.test.espresso:espresso-contrib:${libs.versions.androidx.test.espresso.get()}"
117-
// androidTestImplementation "androidx.test.espresso:espresso-intents:${libs.versions.androidx.test.espresso.get()}"
118-
// androidTestImplementation "androidx.test.espresso:espresso-accessibility:${libs.versions.androidx.test.espresso.get()}"
119-
// androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:${libs.versions.androidx.test.espresso.get()}"
122+
// androidTestImplementation libs.androidx.espresso.idling.concurrent
123+
// androidTestImplementation libs.androidx.espresso.accessibility
124+
// androidTestImplementation libs.androidx.espresso.contrib
125+
// androidTestImplementation libs.androidx.espresso.intents
120126

121127
// The following dependency can be either "implementation" or "androidTestImplementation",
122128
// depending on whether you want it to appear on your APK's compile classpath or the test APK classpath.
123-
// androidTestImplementation "androidx.test.espresso:espresso-idling-resource:${libs.versions.androidx.test.espresso.get()}"
129+
// androidTestImplementation libs.androidx.espresso.idling.resource
124130

125131
// Test rules and transitive dependencies:
126132
androidTestImplementation libs.androidx.compose.uitest
127133

128134
// Needed for createComposeRule, but not createAndroidComposeRule:
129-
//noinspection GradleDependency
135+
//noinspection UseTomlInstead,GradleDependency
130136
debugImplementation "androidx.compose.ui:ui-test-manifest"
131137
}
132138

Diff for: ‎settings.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ dependencyResolutionManagement {
1717
mavenLocal()
1818
maven { url 'https://jitpack.io' }
1919
}
20-
versionCatalogs {
21-
libs {
22-
from(files("libs.versions.toml"))
23-
}
24-
}
2520
}
2621

2722
rootProject.name = "ColorPicker"

0 commit comments

Comments
 (0)