migrated to version catalog.

Author: syslogic

build.gradle

@@ -1,40 +1,19 @@
 // Root project build.gradle
 buildscript {
  ext {
- version_code = 26
- version_name = '1.2.6'
+ version_code = 27
+ version_name = '1.2.7'
  min_sdk = 21
  compile_sdk = 34
  target_sdk = 34
- build_tools_version = '34.0.0'
- android_gradle_plugin_version = '8.3.1'
- material_version = '1.11.0'
- junit_version = '4.13.2'
-
- kotlin_version = '1.9.22'
- kotlin_compiler_extension_version = '1.5.10'
- androidx_compose_bom_version = '2024.02.02'
-
- androidx_core_version = '1.12.0'
- androidx_appcompat_version = '1.6.1'
- androidx_preference_version = '1.2.1'
- androidx_navigation_version = '2.7.7'
-
- androidx_test_junit_version = '1.1.5'
- androidx_test_core_version = '1.5.0'
- androidx_test_monitor_version = '1.6.1'
- androidx_test_runner_version = '1.5.2'
- androidx_test_rules_version = '1.5.0'
- androidx_test_uiautomator_version = '2.3.0'
- androidx_test_espresso_version = '3.5.1'
  }
 }
 
 plugins {
- id 'com.android.application' version "$android_gradle_plugin_version" apply false
- id 'com.android.library' version "$android_gradle_plugin_version" apply false
- id 'androidx.navigation.safeargs' version "$androidx_navigation_version" apply false
- id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
+ alias(libs.plugins.android.application) apply false
+ alias(libs.plugins.android.library) apply false
+ alias(libs.plugins.androidx.navigation.safeargs) apply false
+ alias(libs.plugins.kotlin.android) apply false
 }
 
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip

library/build.gradle

@@ -12,7 +12,7 @@ base {
 
 android {
  namespace 'io.syslogic.colorpicker'
- buildToolsVersion = build_tools_version
+ buildToolsVersion = '34.0.0'
  compileSdk compile_sdk
  defaultConfig {
  testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -35,7 +35,7 @@ android {
  composeOptions {
  // See the "Compose to Kotlin Compatibility Map" for compatible versions:
  // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
- kotlinCompilerExtensionVersion kotlin_compiler_extension_version
+ kotlinCompilerExtensionVersion libs.versions.kotlin.compiler.extension.get()
  }
 
  buildFeatures {
@@ -83,20 +83,15 @@ android {
 
 dependencies {
 
- implementation "com.google.android.material:material:$material_version"
- // implementation "com.google.android.material:compose-theme-adapter-3:1.1.1"
-
- implementation "androidx.core:core-ktx:$androidx_core_version"
- implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
- implementation "androidx.preference:preference-ktx:$androidx_preference_version"
-
- //noinspection GradleDependency
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
- // implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+ implementation libs.material.design
+ implementation libs.androidx.core.ktx
+ implementation libs.androidx.appcompat
+ implementation libs.androidx.preference.ktx
+ implementation libs.kotlin.stdlib
 
  // https://mvnrepository.com/artifact/androidx.compose
  // https://developer.android.com/jetpack/compose/tooling#bom
- implementation platform("androidx.compose:compose-bom:$androidx_compose_bom_version")
+ implementation platform(libs.androidx.compose.bom)
  // implementation "androidx.compose.material:material-icons-core"
  // implementation "androidx.compose.material:material-icons-extended"
  implementation "androidx.compose.foundation:foundation"

libs.versions.toml

@@ -0,0 +1,47 @@
+[versions]
+android_gradle_plugin = '8.3.1'
+material_design = '1.11.0'
+junit = '4.13.2'
+kotlin = '1.9.23'
+kotlin_compiler_extension = '1.5.11'
+androidx_compose_bom = '2024.03.00'
+androidx_compose_uitest = '1.6.4'
+androidx_core = '1.12.0'
+androidx_appcompat = '1.6.1'
+androidx_navigation = '2.7.7'
+androidx_preference = '1.2.1'
+androidx_test_junit = '1.1.5'
+androidx_test_core = '1.5.0'
+androidx_test_rules = '1.5.0'
+androidx_test_runner = '1.5.2'
+androidx_test_monitor = '1.6.1'
+androidx_test_espresso = '3.5.1'
+androidx_test_uiautomator = '2.3.0'
+
+[plugins]
+android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }
+android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }
+androidx_navigation_safeargs = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" }
+kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
+[libraries]
+kotlin_stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+material_design = { module = "com.google.android.material:material", version.ref = "material_design" }
+junit = { module = "junit:junit", version.ref = "junit" }
+androidx_core_ktx = { module = "androidx.core:core-ktx", version.ref = "androidx_core" }
+androidx_appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx_appcompat" }
+androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "androidx_compose_bom" }
+androidx_compose_uitest = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx_compose_uitest" }
+androidx_preference_ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx_preference" }
+androidx_navigation_testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidx_navigation" }
+androidx_navigation_runtime_ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "androidx_navigation" }
+androidx_navigation_fragment_ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx_navigation" }
+androidx_navigation_ui_ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx_navigation" }
+androidx_test_monitor = { module = "androidx.test:monitor", version.ref = "androidx_test_monitor" }
+androidx_test_junit = { module = "androidx.test.ext:junit", version.ref = "androidx_test_junit" }
+androidx_test_core = { module = "androidx.test:core", version.ref = "androidx_test_core" }
+androidx_test_rules = { module = "androidx.test:rules", version.ref = "androidx_test_rules" }
+androidx_test_runner = { module = "androidx.test:runner", version.ref = "androidx_test_runner" }
+androidx_test_uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx_test_uiautomator" }
+androidx_espresso_core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
+androidx_espresso_web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }

mobile/build.gradle

@@ -12,12 +12,12 @@ base {
 
 android {
  namespace "io.syslogic.demo.colorpicker"
- buildToolsVersion = build_tools_version
+ buildToolsVersion = '34.0.0'
  compileSdk compile_sdk
  defaultConfig {
  applicationId "io.syslogic.demo.colorpicker"
- testBuildType "debug"
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ testBuildType "debug"
  versionCode version_code
  versionName version_name
  targetSdk target_sdk
@@ -36,7 +36,7 @@ android {
  composeOptions {
  // See the "Compose to Kotlin Compatibility Map" for compatible versions:
  // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
- kotlinCompilerExtensionVersion kotlin_compiler_extension_version
+ kotlinCompilerExtensionVersion libs.versions.kotlin.compiler.extension.get()
  }
 
  buildFeatures {
@@ -69,20 +69,20 @@ dependencies {
  // implementation "io.syslogic:androidx-colorpicker:$version_name"
  implementation project(path: ':library')
 
- implementation "com.google.android.material:material:$material_version"
+ implementation libs.material.design
 
- implementation "androidx.core:core-ktx:$androidx_core_version"
- implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
- implementation "androidx.preference:preference-ktx:$androidx_preference_version"
+ implementation libs.androidx.core.ktx
+ implementation libs.androidx.appcompat
+ implementation libs.androidx.preference.ktx
 
- androidTestImplementation "androidx.navigation:navigation-testing:$androidx_navigation_version"
- implementation "androidx.navigation:navigation-runtime-ktx:$androidx_navigation_version"
- implementation "androidx.navigation:navigation-fragment-ktx:$androidx_navigation_version"
- implementation "androidx.navigation:navigation-ui-ktx:$androidx_navigation_version"
+ androidTestImplementation libs.androidx.navigation.testing
+ implementation libs.androidx.navigation.runtime.ktx
+ implementation libs.androidx.navigation.fragment.ktx
+ implementation libs.androidx.navigation.ui.ktx
 
  // https://mvnrepository.com/artifact/androidx.compose
  // https://developer.android.com/jetpack/compose/tooling#bom
- implementation platform("androidx.compose:compose-bom:$androidx_compose_bom_version")
+ implementation platform(libs.androidx.compose.bom)
  debugImplementation "androidx.compose.ui:ui-tooling-preview"
  implementation "androidx.activity:activity-compose"
  implementation "androidx.compose.foundation:foundation"
@@ -91,43 +91,43 @@ dependencies {
  implementation "androidx.compose.ui:ui"
 
  // jUnit
- testImplementation "junit:junit:$junit_version"
+ testImplementation libs.junit
 
  // Required for connected tests.
  // https://mvnrepository.com/artifact/androidx.test/monitor
- debugImplementation "androidx.test:monitor:$androidx_test_monitor_version"
+ debugImplementation libs.androidx.test.monitor
 
  // Required for connected tests (ActivityInvoker).
  // https://mvnrepository.com/artifact/androidx.test.ext
- debugImplementation "androidx.test.ext:junit:$androidx_test_junit_version"
+ debugImplementation libs.androidx.test.junit
 
  // https://mvnrepository.com/artifact/androidx.test
  // https://developer.android.com/jetpack/androidx/releases/test
- androidTestImplementation "androidx.test:core:$androidx_test_core_version"
- androidTestImplementation "androidx.test:runner:$androidx_test_runner_version"
- androidTestImplementation "androidx.test:rules:$androidx_test_rules_version"
+ androidTestImplementation libs.androidx.test.core
+ androidTestImplementation libs.androidx.test.runner
+ androidTestImplementation libs.androidx.test.rules
 
  // https://mvnrepository.com/artifact/androidx.test.uiautomator/uiautomator
- androidTestImplementation "androidx.test.uiautomator:uiautomator:$androidx_test_uiautomator_version"
+ androidTestImplementation libs.androidx.test.uiautomator
 
  // Espresso
- androidTestImplementation "androidx.test.espresso:espresso-core:$androidx_test_espresso_version"
- // androidTestImplementation "androidx.test.espresso:espresso-contrib:$androidx_test_espresso_version"
- // androidTestImplementation "androidx.test.espresso:espresso-intents:$androidx_test_espresso_version"
- // androidTestImplementation "androidx.test.espresso:espresso-accessibility:$androidx_test_espresso_version"
- androidTestImplementation "androidx.test.espresso:espresso-web:$androidx_test_espresso_version"
- // androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$androidx_test_espresso_version"
+ androidTestImplementation libs.androidx.espresso.core
+ androidTestImplementation libs.androidx.espresso.web
+ // androidTestImplementation "androidx.test.espresso:espresso-contrib:${libs.versions.androidx.test.espresso.get()}"
+ // androidTestImplementation "androidx.test.espresso:espresso-intents:${libs.versions.androidx.test.espresso.get()}"
+ // androidTestImplementation "androidx.test.espresso:espresso-accessibility:${libs.versions.androidx.test.espresso.get()}"
+ // androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:${libs.versions.androidx.test.espresso.get()}"
 
  // The following dependency can be either "implementation" or "androidTestImplementation",
  // depending on whether you want it to appear on your APK's compile classpath or the test APK classpath.
- // androidTestImplementation "androidx.test.espresso:espresso-idling-resource:$androidx_test_espresso_version"
+ // androidTestImplementation "androidx.test.espresso:espresso-idling-resource:${libs.versions.androidx.test.espresso.get()}"
 
  // Test rules and transitive dependencies:
- androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.3"
+ androidTestImplementation libs.androidx.compose.uitest
 
  // Needed for createComposeRule, but not createAndroidComposeRule:
  //noinspection GradleDependency
- debugImplementation("androidx.compose.ui:ui-test-manifest")
+ debugImplementation "androidx.compose.ui:ui-test-manifest"
 }
 
 // disable caching

settings.gradle

@@ -17,6 +17,11 @@ dependencyResolutionManagement {
  mavenLocal()
  maven { url 'https://jitpack.io' }
  }
+ versionCatalogs {
+ libs {
+ from(files("libs.versions.toml"))
+ }
+ }
 }
 
 rootProject.name = "ColorPicker"