Skip to content

Commit bc7ef8e

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

File tree

6 files changed

+95
-69
lines changed

6 files changed

+95
-69
lines changed

‎build.gradle

+6-27
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,19 @@
11
// Root project build.gradle
22
buildscript {
33
ext {
4-
version_code = 26
5-
version_name = '1.2.6'
4+
version_code = 27
5+
version_name = '1.2.7'
66
min_sdk = 21
77
compile_sdk = 34
88
target_sdk = 34
9-
build_tools_version = '34.0.0'
10-
android_gradle_plugin_version = '8.3.1'
11-
material_version = '1.11.0'
12-
junit_version = '4.13.2'
13-
14-
kotlin_version = '1.9.22'
15-
kotlin_compiler_extension_version = '1.5.10'
16-
androidx_compose_bom_version = '2024.02.02'
17-
18-
androidx_core_version = '1.12.0'
19-
androidx_appcompat_version = '1.6.1'
20-
androidx_preference_version = '1.2.1'
21-
androidx_navigation_version = '2.7.7'
22-
23-
androidx_test_junit_version = '1.1.5'
24-
androidx_test_core_version = '1.5.0'
25-
androidx_test_monitor_version = '1.6.1'
26-
androidx_test_runner_version = '1.5.2'
27-
androidx_test_rules_version = '1.5.0'
28-
androidx_test_uiautomator_version = '2.3.0'
29-
androidx_test_espresso_version = '3.5.1'
309
}
3110
}
3211

3312
plugins {
34-
id 'com.android.application' version "$android_gradle_plugin_version" apply false
35-
id 'com.android.library' version "$android_gradle_plugin_version" apply false
36-
id 'androidx.navigation.safeargs' version "$androidx_navigation_version" apply false
37-
id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
13+
alias(libs.plugins.android.application) apply false
14+
alias(libs.plugins.android.library) apply false
15+
alias(libs.plugins.androidx.navigation.safeargs) apply false
16+
alias(libs.plugins.kotlin.android) apply false
3817
}
3918

4019
allprojects {

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip

‎library/build.gradle

+8-13
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ base {
1212

1313
android {
1414
namespace 'io.syslogic.colorpicker'
15-
buildToolsVersion = build_tools_version
15+
buildToolsVersion = '34.0.0'
1616
compileSdk compile_sdk
1717
defaultConfig {
1818
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -35,7 +35,7 @@ android {
3535
composeOptions {
3636
// See the "Compose to Kotlin Compatibility Map" for compatible versions:
3737
// https://developer.android.com/jetpack/androidx/releases/compose-kotlin
38-
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
38+
kotlinCompilerExtensionVersion libs.versions.kotlin.compiler.extension.get()
3939
}
4040

4141
buildFeatures {
@@ -83,20 +83,15 @@ android {
8383

8484
dependencies {
8585

86-
implementation "com.google.android.material:material:$material_version"
87-
// implementation "com.google.android.material:compose-theme-adapter-3:1.1.1"
88-
89-
implementation "androidx.core:core-ktx:$androidx_core_version"
90-
implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
91-
implementation "androidx.preference:preference-ktx:$androidx_preference_version"
92-
93-
//noinspection GradleDependency
94-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
95-
// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
86+
implementation libs.material.design
87+
implementation libs.androidx.core.ktx
88+
implementation libs.androidx.appcompat
89+
implementation libs.androidx.preference.ktx
90+
implementation libs.kotlin.stdlib
9691

9792
// https://mvnrepository.com/artifact/androidx.compose
9893
// https://developer.android.com/jetpack/compose/tooling#bom
99-
implementation platform("androidx.compose:compose-bom:$androidx_compose_bom_version")
94+
implementation platform(libs.androidx.compose.bom)
10095
// implementation "androidx.compose.material:material-icons-core"
10196
// implementation "androidx.compose.material:material-icons-extended"
10297
implementation "androidx.compose.foundation:foundation"

‎libs.versions.toml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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" }

‎mobile/build.gradle

+28-28
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ base {
1212

1313
android {
1414
namespace "io.syslogic.demo.colorpicker"
15-
buildToolsVersion = build_tools_version
15+
buildToolsVersion = '34.0.0'
1616
compileSdk compile_sdk
1717
defaultConfig {
1818
applicationId "io.syslogic.demo.colorpicker"
19-
testBuildType "debug"
2019
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
20+
testBuildType "debug"
2121
versionCode version_code
2222
versionName version_name
2323
targetSdk target_sdk
@@ -36,7 +36,7 @@ android {
3636
composeOptions {
3737
// See the "Compose to Kotlin Compatibility Map" for compatible versions:
3838
// https://developer.android.com/jetpack/androidx/releases/compose-kotlin
39-
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
39+
kotlinCompilerExtensionVersion libs.versions.kotlin.compiler.extension.get()
4040
}
4141

4242
buildFeatures {
@@ -69,20 +69,20 @@ dependencies {
6969
// implementation "io.syslogic:androidx-colorpicker:$version_name"
7070
implementation project(path: ':library')
7171

72-
implementation "com.google.android.material:material:$material_version"
72+
implementation libs.material.design
7373

74-
implementation "androidx.core:core-ktx:$androidx_core_version"
75-
implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
76-
implementation "androidx.preference:preference-ktx:$androidx_preference_version"
74+
implementation libs.androidx.core.ktx
75+
implementation libs.androidx.appcompat
76+
implementation libs.androidx.preference.ktx
7777

78-
androidTestImplementation "androidx.navigation:navigation-testing:$androidx_navigation_version"
79-
implementation "androidx.navigation:navigation-runtime-ktx:$androidx_navigation_version"
80-
implementation "androidx.navigation:navigation-fragment-ktx:$androidx_navigation_version"
81-
implementation "androidx.navigation:navigation-ui-ktx:$androidx_navigation_version"
78+
androidTestImplementation libs.androidx.navigation.testing
79+
implementation libs.androidx.navigation.runtime.ktx
80+
implementation libs.androidx.navigation.fragment.ktx
81+
implementation libs.androidx.navigation.ui.ktx
8282

8383
// https://mvnrepository.com/artifact/androidx.compose
8484
// https://developer.android.com/jetpack/compose/tooling#bom
85-
implementation platform("androidx.compose:compose-bom:$androidx_compose_bom_version")
85+
implementation platform(libs.androidx.compose.bom)
8686
debugImplementation "androidx.compose.ui:ui-tooling-preview"
8787
implementation "androidx.activity:activity-compose"
8888
implementation "androidx.compose.foundation:foundation"
@@ -91,43 +91,43 @@ dependencies {
9191
implementation "androidx.compose.ui:ui"
9292

9393
// jUnit
94-
testImplementation "junit:junit:$junit_version"
94+
testImplementation libs.junit
9595

9696
// Required for connected tests.
9797
// https://mvnrepository.com/artifact/androidx.test/monitor
98-
debugImplementation "androidx.test:monitor:$androidx_test_monitor_version"
98+
debugImplementation libs.androidx.test.monitor
9999

100100
// Required for connected tests (ActivityInvoker).
101101
// https://mvnrepository.com/artifact/androidx.test.ext
102-
debugImplementation "androidx.test.ext:junit:$androidx_test_junit_version"
102+
debugImplementation libs.androidx.test.junit
103103

104104
// https://mvnrepository.com/artifact/androidx.test
105105
// https://developer.android.com/jetpack/androidx/releases/test
106-
androidTestImplementation "androidx.test:core:$androidx_test_core_version"
107-
androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
108-
androidTestImplementation "androidx.test:rules:$androidx_test_rules_version"
106+
androidTestImplementation libs.androidx.test.core
107+
androidTestImplementation libs.androidx.test.runner
108+
androidTestImplementation libs.androidx.test.rules
109109

110110
// https://mvnrepository.com/artifact/androidx.test.uiautomator/uiautomator
111-
androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidx_test_uiautomator_version"
111+
androidTestImplementation libs.androidx.test.uiautomator
112112

113113
// Espresso
114-
androidTestImplementation "androidx.test.espresso:espresso-core:$androidx_test_espresso_version"
115-
// androidTestImplementation "androidx.test.espresso:espresso-contrib:$androidx_test_espresso_version"
116-
// androidTestImplementation "androidx.test.espresso:espresso-intents:$androidx_test_espresso_version"
117-
// androidTestImplementation "androidx.test.espresso:espresso-accessibility:$androidx_test_espresso_version"
118-
androidTestImplementation "androidx.test.espresso:espresso-web:$androidx_test_espresso_version"
119-
// androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$androidx_test_espresso_version"
114+
androidTestImplementation libs.androidx.espresso.core
115+
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()}"
120120

121121
// The following dependency can be either "implementation" or "androidTestImplementation",
122122
// 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:$androidx_test_espresso_version"
123+
// androidTestImplementation "androidx.test.espresso:espresso-idling-resource:${libs.versions.androidx.test.espresso.get()}"
124124

125125
// Test rules and transitive dependencies:
126-
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.3"
126+
androidTestImplementation libs.androidx.compose.uitest
127127

128128
// Needed for createComposeRule, but not createAndroidComposeRule:
129129
//noinspection GradleDependency
130-
debugImplementation("androidx.compose.ui:ui-test-manifest")
130+
debugImplementation "androidx.compose.ui:ui-test-manifest"
131131
}
132132

133133
// disable caching

‎settings.gradle

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

2227
rootProject.name = "ColorPicker"

0 commit comments

Comments
 (0)