Skip to content

Commit 397574b

Browse files
committed
version 1.3.6
1 parent a6f28e3 commit 397574b

6 files changed

Lines changed: 39 additions & 6 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ The library is generally available on JitPack; either by version tag or `master-
88
The JitPack repository URL would be: `maven { url 'https://jitpack.io' }`
99

1010
dependencies {
11-
implementation "io.syslogic:androidx-colorpicker:1.2.9"
11+
implementation("io.syslogic.androidx-colorpicker:colorpicker-legacy:1.3.6")
12+
implementation("io.syslogic.androidx-colorpicker:colorpicker-compose:1.3.6")
1213
}
1314

1415
---

compose/build.gradle.kts

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ configure<LibraryExtension> {
4343
consumerProguardFiles(rootProject.file("consumer.pro").absolutePath)
4444
}
4545

46+
@Suppress("UnstableApiUsage")
4647
sourceSets {
4748
getByName("main") {
4849
java.directories.add("src/main/java")
@@ -118,6 +119,12 @@ dependencies {
118119
dokkaPlugin(libs.dokka.android.documentation.plugin)
119120
}
120121

122+
// Gradle 9.0 deprecation fix
123+
val implCls: Configuration by configurations.creating {
124+
extendsFrom(configurations.getByName("implementation"))
125+
isCanBeResolved = true
126+
}
127+
121128
// Dokka generation
122129
dokka {
123130

@@ -129,6 +136,7 @@ dokka {
129136

130137
sourceRoots.from(
131138
files(File("${sdkDirectory}/platforms/${compileSdk}/android.jar")),
139+
fileTree(project.file("build/tmp/aarsToJars").absolutePath),
132140
"${projectDir.absolutePath}/src/main/java"
133141
)
134142

@@ -159,6 +167,31 @@ dokka {
159167
}
160168
}
161169

170+
val extractAar by tasks.registering(DefaultTask::class) {
171+
doFirst {
172+
// extract AAR files
173+
implCls.files
174+
.filter { it.name.endsWith(".aar") }
175+
.forEach { aar: File ->
176+
copy {
177+
from(zipTree(aar))
178+
include("**/classes.jar")
179+
into(project.file("build/tmp/aarsToJars/${aar.name.replace(".aar", "")}/"))
180+
}
181+
}
182+
183+
// provide JAR, which contains the generated data-binding classes
184+
val aarMain = project.file("build/intermediates/aar_main_jar")
185+
if (aarMain.exists()) {
186+
copy {
187+
from(aarMain)
188+
include("**/classes.jar")
189+
into(project.file("build/tmp/aarsToJars/aar_main_jar/"))
190+
}
191+
}
192+
}
193+
}
194+
162195
val dokkaGenerateJavadocJar by tasks.registering(Jar::class) {
163196
group = "dokka"
164197
dependsOn(tasks.dokkaGeneratePublicationJavadoc)
@@ -189,6 +222,7 @@ val dokkaCleanHtml by tasks.registering(Delete::class) {
189222

190223
tasks.dokkaGeneratePublicationJavadoc.dependsOn(dokkaCleanJavadoc)
191224
tasks.dokkaGeneratePublicationHtml.dependsOn(dokkaCleanHtml)
225+
tasks.dokkaGenerate.dependsOn(extractAar)
192226

193227
val dokkaClean by tasks.registering {
194228
group = "dokka"

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

File renamed without changes.

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

File renamed without changes.

gradle.properties

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ org.gradle.parallel=false
99
kapt.incremental.apt=false
1010
# kotlin.experimental.tryK2=true
1111
# android.lint.useK2Uast=false
12-
12+
# android.experimental.fusedLibrarySupport=true
1313
android.enableJetifier=false
1414
android.useAndroidX=true
1515
android.newDsl=false
1616

17-
android.experimental.fusedLibrarySupport=true
18-
1917
GITHUB_HANDLE = "syslogic"
2018
GITHUB_EMAIL = "syslogic@users.noreply.github.com"
2119
GITHUB_DEV = "Martin Zeitler"

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
22
#noinspection UnusedVersionCatalogEntry
3-
app_version_code = "35"
3+
app_version_code = "36"
44
#noinspection UnusedVersionCatalogEntry
5-
app_version_name = "1.3.5"
5+
app_version_name = "1.3.6"
66
#noinspection UnusedVersionCatalogEntry
77
android_compile_sdk = "36"
88
#noinspection UnusedVersionCatalogEntry

0 commit comments

Comments
 (0)