version 1.3.5

Author: syslogic

build.gradle.kts

@@ -2,10 +2,12 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.fusedlibrary) apply false
     alias(libs.plugins.androidx.navigation.safeargs) apply false
     alias(libs.plugins.kotlin.compose.compiler) apply false
-    alias(libs.plugins.builtin.kotlin) apply false
-    alias(libs.plugins.legacy.kapt) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    // alias(libs.plugins.builtin.kotlin) apply false
+    // alias(libs.plugins.legacy.kapt) apply false
     alias(libs.plugins.dokka.javadoc) apply false
     alias(libs.plugins.dokka.html) apply false
 }

compose/build.gradle.kts

@@ -6,8 +6,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.compose.compiler)
-    alias(libs.plugins.builtin.kotlin)
-    alias(libs.plugins.legacy.kapt)
+    alias(libs.plugins.kotlin.android)
+    // alias(libs.plugins.builtin.kotlin)
+    // alias(libs.plugins.legacy.kapt)
     alias(libs.plugins.dokka.html)
     alias(libs.plugins.dokka.javadoc)
     id("maven-publish")
@@ -120,7 +121,7 @@ dependencies {
 // Dokka generation
 dokka {
 
-    dokkaSourceSets.create("main") {
+    dokkaSourceSets.named("main") {
 
         val sdkComponents = androidComponents::sdkComponents.get()
         val sdkDirectory: Directory? = sdkComponents.sdkDirectory.get()

fusedlibrary/build.gradle.kts

@@ -0,0 +1,19 @@
+import com.android.build.api.dsl.FusedLibraryExtension
+import com.android.build.api.dsl.MinSdkSpec
+
+plugins {
+    alias(libs.plugins.android.fusedlibrary)
+    id("maven-publish")
+}
+
+configure<FusedLibraryExtension> {
+    namespace = "io.syslogic.colorpicker"
+    minSdk {
+        release(version = Integer.parseInt(libs.versions.android.min.sdk.get())) as MinSdkSpec
+    }
+}
+
+dependencies {
+    include(project(path = ":legacy"))
+    include(project(path = ":compose"))
+}

gradle.properties

@@ -14,6 +14,8 @@ 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"

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-app_version_code                      = "34"
+app_version_code                      = "35"
 #noinspection UnusedVersionCatalogEntry
-app_version_name                      = "1.3.4"
+app_version_name                      = "1.3.5"
 #noinspection UnusedVersionCatalogEntry
 android_compile_sdk                   = "36"
 #noinspection UnusedVersionCatalogEntry
@@ -12,7 +12,7 @@ android_min_sdk                       = "23"
 
 # Gradle Plugins
 kotlin                                = "2.3.10"
-android_gradle_plugin                 = "9.1.0"
+android_gradle_plugin                 = "8.13.1" # 9.1.0 doesn't work with Dokka
 
 junit                                 = "4.13.2"
 dokka                                 = "2.1.0"
@@ -39,9 +39,11 @@ androidx_test_uiautomator             = "2.3.0"
 androidx_navigation_safeargs          = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" }
 android_application                   = { id = "com.android.application", version.ref = "android_gradle_plugin" }
 android_library                       = { id = "com.android.library", version.ref = "android_gradle_plugin" }
+android_fusedlibrary                  = { id = "com.android.fused-library", version.ref = "android_gradle_plugin" }
+# builtin_kotlin                      = { id = "com.android.built-in-kotlin", version.ref = "android_gradle_plugin" }
+# legacy_kapt                         = { id = "com.android.legacy-kapt", version.ref = "android_gradle_plugin" }
+kotlin_android                        = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin_compose_compiler               = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-builtin_kotlin                        = { id = "com.android.built-in-kotlin", version.ref = "android_gradle_plugin" }
-legacy_kapt                           = { id = "com.android.legacy-kapt", version.ref = "android_gradle_plugin" }
 dokka_javadoc                         = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" }
 dokka_html                            = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 

legacy/build.gradle.kts

@@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.builtin.kotlin)
-    alias(libs.plugins.legacy.kapt)
+    alias(libs.plugins.kotlin.android)
+    // alias(libs.plugins.builtin.kotlin)
     id("maven-publish")
 }
 

mobile/build.gradle.kts

@@ -6,8 +6,9 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.androidx.navigation.safeargs)
     alias(libs.plugins.kotlin.compose.compiler)
-    alias(libs.plugins.builtin.kotlin)
-    alias(libs.plugins.legacy.kapt)
+    alias(libs.plugins.kotlin.android)
+    // alias(libs.plugins.builtin.kotlin)
+    // alias(libs.plugins.legacy.kapt)
 }
 
 base {

settings.gradle.kts

@@ -27,6 +27,7 @@ dependencyResolutionManagement {
 rootProject.name = "ColorPicker"
 
 include(":legacy", ":compose")
+// include(":fusedlibrary")
 
 /* JitPack: exclude module. */
 if (System.getenv("JITPACK") == null) {