migrated to version catalog.

Author: syslogic

build.gradle

@@ -1,14 +1,4 @@
 // Root project build.gradle
-buildscript {
-    ext {
-        version_code = 28
-        version_name = '1.2.9'
-        min_sdk = 21
-        compile_sdk = 35
-        target_sdk = 35
-    }
-}
-
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false

gradle.properties

@@ -1,13 +1,12 @@
 # Project-wide Gradle settings.
 # @see https://docs.gradle.org/current/userguide/build_environment.html
-org.gradle.welcome=never
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.configureondemand=false
+org.gradle.parallel=false
 
 kapt.incremental.apt=false
 # kotlin.experimental.tryK2=true
 # android.lint.useK2Uast=false
 
 android.enableJetifier=false
 android.useAndroidX=true
-
-android.suppressUnsupportedCompileSdk=35

gradle/libs.versions.toml

@@ -1,8 +1,14 @@
 [versions]
+app_version_code          = '29'
+app_version_name          = '1.3.0'
+android_compile_sdk       = '35'
+android_target_sdk        = '35'
+android_min_sdk           = '21'
+android_build_tools       = '35.0.0'
 android_gradle_plugin     = '8.7.0'
 material_design           = '1.12.0'
 junit                     = '4.13.2'
-kotlin                    = '2.0.20'
+kotlin                    = '2.0.21'
 # devtools_ksp            = "2.0.20-1.0.25"
 androidx_compose_bom      = '2024.09.03'
 androidx_compose_uitest   = '1.7.3'

library/build.gradle

@@ -5,22 +5,22 @@ plugins {
     alias(libs.plugins.kotlin.compose.compiler)
     // alias(libs.plugins.devtools.ksp)
     alias(libs.plugins.kotlin.kapt)
-    id 'maven-publish'
+    id "maven-publish"
 }
 
 base {
-    archivesName = 'colorpicker_' + version_name
+    archivesName = "colorpicker_${libs.versions.app.version.name.get()}"
 }
 
 android {
-    namespace 'io.syslogic.colorpicker'
-    buildToolsVersion = '35.0.0'
-    compileSdk compile_sdk
+    namespace "io.syslogic.colorpicker"
+    buildToolsVersion = libs.versions.android.build.tools.get()
+    compileSdk Integer.parseInt(libs.versions.android.compile.sdk.get())
     defaultConfig {
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        consumerProguardFiles "${project.rootDir}/proguard/consumer.pro"
-        targetSdk target_sdk
-        minSdk min_sdk
+        minSdk Integer.parseInt(libs.versions.android.min.sdk.get())
+        targetSdk Integer.parseInt(libs.versions.android.target.sdk.get())
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "${project.getProjectDir().absolutePath}/consumer.pro"
     }
 
     sourceSets.main.java.srcDirs = [ "src/main/java" ]
@@ -34,12 +34,6 @@ android {
         jvmTarget = 17
     }
 
-    buildFeatures {
-        buildConfig true
-        dataBinding true
-        compose true
-    }
-
     composeOptions {
     }
 
@@ -49,6 +43,12 @@ android {
         stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
     }
 
+    buildFeatures {
+        buildConfig true
+        dataBinding true
+        compose true
+    }
+
     buildTypes {
         debug {
             // it breaks the data-binding, eg. when running ./gradlew :library:publishToMavenLocal
@@ -74,12 +74,14 @@ android {
     }
 
     packagingOptions {
-        resources.pickFirsts.add('META-INF/LGPL2.1')
-        resources.pickFirsts.add('META-INF/AL2.0')
+        resources.pickFirsts.add("META-INF/LGPL2.1")
+        resources.pickFirsts.add("META-INF/AL2.0")
+        // Unable to strip the following libraries, packaging them as they are:
+        jniLibs.keepDebugSymbols.add("**/libandroidx.graphics.path.so")
     }
 
     publishing {
-        singleVariant('release') {
+        singleVariant("release") {
             withSourcesJar()
             withJavadocJar()
         }
@@ -103,7 +105,7 @@ dependencies {
     debugImplementation libs.bundles.androidx.compose.tooling
 }
 
-tasks.register('javadoc', Javadoc) { it ->
+tasks.register("javadoc", Javadoc) { it ->
 
     title = "Color Picker ${android.defaultConfig.versionName} API"
     source = android.sourceSets.main.java.srcDirs
@@ -129,12 +131,12 @@ tasks.register('javadoc', Javadoc) { it ->
 
         // extract AAR files
         configurations.implementation
-                .filter { it.name.endsWith('.aar') }
+                .filter { it.name.endsWith(".aar") }
                 .each { aar ->
                     copy {
                         from zipTree(aar)
                         include "**/classes.jar"
-                        into project.file("build/tmp/aarsToJars/${aar.name.replace('.aar', '')}/")
+                        into project.file("build/tmp/aarsToJars/${aar.name.replace(".aar", "")}/")
                     }
                 }
 
@@ -154,36 +156,36 @@ javadoc.onlyIf {
     project.file("build/intermediates/aar_main_jar").exists()
 }
 
-tasks.register('javadocJar', Jar) {
+tasks.register("javadocJar", Jar) {
     dependsOn javadoc
-    archiveClassifier.set('javadoc')
+    archiveClassifier.set("javadoc")
     from javadoc.destinationDir
 }
 
-tasks.register('sourcesJar', Jar) {
+tasks.register("sourcesJar", Jar) {
     from android.sourceSets.main.java.srcDirs
-    archiveClassifier.set('sources')
+    archiveClassifier.set("sources")
 }
 
 artifacts {
     archives javadocJar
     archives sourcesJar
 }
 
-group = 'io.syslogic'
-version = version_name
+group   = "io.syslogic"
+version = libs.versions.app.version.name.get()
 
 afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
                 groupId = group
-                artifactId = 'androidx-colorpicker'
-                from components.getByName('release')
-                version = version_name
+                artifactId = "androidx-colorpicker"
+                from components.getByName("release")
+                version = libs.versions.app.version.name.get()
                 pom {
-                    name = 'Color Picker'
-                    description = 'A simple color-picker library for Android'
+                    name = "Color Picker"
+                    description = "A simple color-picker library for Android"
                     url = "https://github.com/syslogic/${artifactId}"
                     scm {
                         connection = "scm:git:git://github.com/syslogic/${artifactId}.git"

proguard/consumer.pro renamed to library/consumer.pro

@@ -9,38 +9,26 @@ plugins {
 }
 
 base {
-    archivesName = 'colorpicker_demo_' + version_name
+    archivesName = "colorpicker_demo_${libs.versions.app.version.name.get()}"
 }
 
 android {
     namespace "io.syslogic.demo.colorpicker"
-    buildToolsVersion = '35.0.0'
-    compileSdk compile_sdk
+    buildToolsVersion = libs.versions.android.build.tools.get()
+    compileSdk Integer.parseInt(libs.versions.android.compile.sdk.get())
     defaultConfig {
+        minSdk Integer.parseInt(libs.versions.android.min.sdk.get())
+        targetSdk Integer.parseInt(libs.versions.android.target.sdk.get())
+        versionCode Integer.parseInt(libs.versions.app.version.code.get())
+        versionName libs.versions.app.version.name.get()
         applicationId "io.syslogic.demo.colorpicker"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testBuildType "debug"
-        versionCode version_code
-        versionName version_name
-        targetSdk target_sdk
-        minSdk min_sdk
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
     kotlinOptions {
         jvmTarget = 17
     }
 
-    buildFeatures {
-        buildConfig true
-        dataBinding true
-        compose true
-    }
-
     composeOptions {
     }
 
@@ -50,6 +38,17 @@ android {
         stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    buildFeatures {
+        buildConfig true
+        dataBinding true
+        compose true
+    }
+
     buildTypes {
         debug {
             minifyEnabled false
@@ -59,6 +58,11 @@ android {
         }
     }
 
+    packagingOptions {
+        // Unable to strip the following libraries, packaging them as they are:
+        jniLibs.keepDebugSymbols.add("**/libandroidx.graphics.path.so")
+    }
+
     lint {
         lintConfig file('../lint.xml')
         checkAllWarnings true