version 1.3.6

Author: syslogic

README.md

@@ -8,7 +8,8 @@ The library is generally available on JitPack; either by version tag or `master-
 The JitPack repository URL would be: `maven { url 'https://jitpack.io' }`
 
     dependencies {
-        implementation "io.syslogic:androidx-colorpicker:1.2.9"
+        implementation("io.syslogic.androidx-colorpicker:colorpicker-legacy:1.3.6")
+        implementation("io.syslogic.androidx-colorpicker:colorpicker-compose:1.3.6")
     }
 
  ---

compose/build.gradle.kts

@@ -43,8 +43,9 @@ configure<LibraryExtension> {
         consumerProguardFiles(rootProject.file("consumer.pro").absolutePath)
     }
 
+    @Suppress("UnstableApiUsage")
     sourceSets {
-        getByName("main") {
+        named("main") {
             java.directories.add("src/main/java")
         }
     }
@@ -118,6 +119,12 @@ dependencies {
     dokkaPlugin(libs.dokka.android.documentation.plugin)
 }
 
+// Gradle 9.0 deprecation fix
+val implCls: Configuration by configurations.creating {
+    extendsFrom(configurations.getByName("implementation"))
+    isCanBeResolved = true
+}
+
 // Dokka generation
 dokka {
 
@@ -129,6 +136,7 @@ dokka {
 
         sourceRoots.from(
             files(File("${sdkDirectory}/platforms/${compileSdk}/android.jar")),
+            fileTree(project.file("build/tmp/aarsToJars").absolutePath),
             "${projectDir.absolutePath}/src/main/java"
         )
 
@@ -159,6 +167,31 @@ dokka {
     }
 }
 
+val extractAar by tasks.registering(DefaultTask::class) {
+    doFirst {
+        // extract AAR files
+        implCls.files
+            .filter { it.name.endsWith(".aar") }
+            .forEach { aar: File ->
+                copy {
+                    from(zipTree(aar))
+                    include("**/classes.jar")
+                    into(project.file("build/tmp/aarsToJars/${aar.name.replace(".aar", "")}/"))
+                }
+            }
+
+        // provide JAR, which contains the generated data-binding classes
+        val aarMain = project.file("build/intermediates/aar_main_jar")
+        if (aarMain.exists()) {
+            copy {
+                from(aarMain)
+                include("**/classes.jar")
+                into(project.file("build/tmp/aarsToJars/aar_main_jar/"))
+            }
+        }
+    }
+}
+
 val dokkaGenerateJavadocJar by tasks.registering(Jar::class) {
     group = "dokka"
     dependsOn(tasks.dokkaGeneratePublicationJavadoc)
@@ -189,6 +222,7 @@ val dokkaCleanHtml by tasks.registering(Delete::class) {
 
 tasks.dokkaGeneratePublicationJavadoc.dependsOn(dokkaCleanJavadoc)
 tasks.dokkaGeneratePublicationHtml.dependsOn(dokkaCleanHtml)
+tasks.dokkaGenerate.dependsOn(extractAar)
 
 val dokkaClean by tasks.registering {
     group = "dokka"

…cker/compose/ColorPickerDialogPreview.kt …cker/compose/ColorPickerDialogPreview.ktcompose/src/main/java/io/syslogic/colorpicker/compose/ColorPickerDialogPreview.kt renamed to compose/src/debug/java/io/syslogic/colorpicker/compose/ColorPickerDialogPreview.kt compose/src/main/java/io/syslogic/colorpicker/compose/ColorPickerDialogPreview.kt renamed to compose/src/debug/java/io/syslogic/colorpicker/compose/ColorPickerDialogPreview.kt

@@ -9,13 +9,11 @@ org.gradle.parallel=false
 kapt.incremental.apt=false
 # kotlin.experimental.tryK2=true
 # android.lint.useK2Uast=false
-
+# android.experimental.fusedLibrarySupport=true
 android.enableJetifier=false
 android.useAndroidX=true
 android.newDsl=false
 
-android.experimental.fusedLibrarySupport=true
-
 GITHUB_HANDLE = "syslogic"
 GITHUB_EMAIL  = "syslogic@users.noreply.github.com"
 GITHUB_DEV    = "Martin Zeitler"

…olorpicker/compose/ColorPickerPreview.kt …olorpicker/compose/ColorPickerPreview.ktcompose/src/main/java/io/syslogic/colorpicker/compose/ColorPickerPreview.kt renamed to compose/src/debug/java/io/syslogic/colorpicker/compose/ColorPickerPreview.kt compose/src/main/java/io/syslogic/colorpicker/compose/ColorPickerPreview.kt renamed to compose/src/debug/java/io/syslogic/colorpicker/compose/ColorPickerPreview.kt

@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-app_version_code                      = "35"
+app_version_code                      = "36"
 #noinspection UnusedVersionCatalogEntry
-app_version_name                      = "1.3.5"
+app_version_name                      = "1.3.6"
 #noinspection UnusedVersionCatalogEntry
 android_compile_sdk                   = "36"
 #noinspection UnusedVersionCatalogEntry

gradle.properties

@@ -34,8 +34,9 @@ configure<LibraryExtension> {
         consumerProguardFiles(rootProject.file("consumer.pro").absolutePath)
     }
 
+    @Suppress("UnstableApiUsage")
     sourceSets {
-        getByName("main") {
+        named("main") {
             java.directories.add("src/main/java")
         }
     }

gradle/libs.versions.toml

@@ -62,8 +62,9 @@ configure<ApplicationExtension> {
         }
     }
 
+    @Suppress("UnstableApiUsage")
     sourceSets {
-        getByName("main") {
+        named("main") {
             java.directories.add("src/main/java")
         }
     }