Skip to content

Commit 4dd891a

Browse files
syslogicsyslogic
committed
Gradle 9.3, AGP 9.0
1 parent 70bce2e commit 4dd891a

File tree

63 files changed

+442
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+442
-171
lines changed

‎.github/workflows/android-ci.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,22 @@ jobs:
5555
- name: 🔨 Build with Gradle
5656
env:
5757
VERSION_TAG: ${{ steps.vars.outputs.tag }}
58-
run: ./gradlew :library:assembleRelease
58+
run: ./gradlew :legacy:assembleRelease :compose:assembleRelease
5959

6060
# https://github.com/actions/upload-artifact
6161
- name: 📦 Retain Artifacts (Release AAR)
62-
id: retain-release-aar
62+
id: retain-compose-release-aar
6363
uses: actions/upload-artifact@v4
6464
with:
65-
name: androidx-colorpicker-aar
66-
path: ./library/build/outputs/aar/colorpicker_*-release.aar
65+
name: androidx-colorpicker-compose-aar
66+
path: ./compose/build/outputs/aar/colorpicker_*-release.aar
6767
retention-days: 14
68+
69+
# https://github.com/actions/upload-artifact
70+
- name: 📦 Retain Artifacts (Release AAR)
71+
id: retain-legacy-release-aar
72+
uses: actions/upload-artifact@v4
73+
with:
74+
name: androidx-colorpicker-legacy-aar
75+
path: ./legacy/build/outputs/aar/colorpicker_*-release.aar
76+
retention-days: 14

‎.run/ColorPickerDialog.run.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<option name="ALL_USERS" value="false" />
1010
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
1111
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
12-
<option name="ACTIVITY_EXTRA_FLAGS" value="--es composable io.syslogic.colorpicker.compose.ColorPickerDialogPreviewKt.ColorPickerDialogPreview" />
12+
<option name="ACTIVITY_EXTRA_FLAGS" value="--es composable io.syslogic.compose.compose.ColorPickerDialogPreviewKt.ColorPickerDialogPreview" />
1313
<option name="MODE" value="specific_activity" />
1414
<option name="CLEAR_LOGCAT" value="false" />
1515
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
@@ -52,7 +52,7 @@
5252
<option name="ACTIVITY_CLASS" value="androidx.compose.ui.tooling.PreviewActivity" />
5353
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="true" />
5454
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
55-
<compose-preview-run-configuration composable-fqn="io.syslogic.colorpicker.compose.ColorPickerDialogPreviewKt.ColorPickerDialogPreview" />
55+
<compose-preview-run-configuration composable-fqn="io.syslogic.compose.compose.ColorPickerDialogPreviewKt.ColorPickerDialogPreview" />
5656
<method v="2">
5757
<option name="Make" enabled="true" />
5858
<option name="Android.Gradle.BeforeRunTask" enabled="true" />

‎.run/ColorPickerPreview.run.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<option name="ALL_USERS" value="false" />
1010
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
1111
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
12-
<option name="ACTIVITY_EXTRA_FLAGS" value="--es composable io.syslogic.colorpicker.compose.ColorPickerPreviewKt.ColorPickerPreview" />
12+
<option name="ACTIVITY_EXTRA_FLAGS" value="--es composable io.syslogic.compose.compose.ColorPickerPreviewKt.ColorPickerPreview" />
1313
<option name="MODE" value="specific_activity" />
1414
<option name="CLEAR_LOGCAT" value="false" />
1515
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
@@ -52,7 +52,7 @@
5252
<option name="ACTIVITY_CLASS" value="androidx.compose.ui.tooling.PreviewActivity" />
5353
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="true" />
5454
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
55-
<compose-preview-run-configuration composable-fqn="io.syslogic.colorpicker.compose.ColorPickerPreviewKt.ColorPickerPreview" />
55+
<compose-preview-run-configuration composable-fqn="io.syslogic.compose.compose.ColorPickerPreviewKt.ColorPickerPreview" />
5656
<method v="2">
5757
<option name="Make" enabled="true" />
5858
<option name="Android.Gradle.BeforeRunTask" enabled="true" />

‎.run/TestColorPicker.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<module name="ColorPicker.mobile.androidTest" />
44
<option name="TESTING_TYPE" value="2" />
55
<option name="METHOD_NAME" value="colorPickerTest" />
6-
<option name="CLASS_NAME" value="io.syslogic.demo.colorpicker.TestColorPicker" />
6+
<option name="CLASS_NAME" value="io.syslogic.compose.demo.colorpicker.TestColorPicker" />
77
<option name="PACKAGE_NAME" value="" />
88
<option name="TEST_NAME_REGEX" value="" />
99
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />

‎.run/TestSuite.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<module name="ColorPicker.mobile.androidTest" />
44
<option name="TESTING_TYPE" value="2" />
55
<option name="METHOD_NAME" value="" />
6-
<option name="CLASS_NAME" value="io.syslogic.demo.colorpicker.TestSuite" />
6+
<option name="CLASS_NAME" value="io.syslogic.compose.demo.colorpicker.TestSuite" />
77
<option name="PACKAGE_NAME" value="" />
88
<option name="TEST_NAME_REGEX" value="" />
99
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />

‎README.md‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ class ColorPickerDialogFragmentImpl extends ColorPickerDialogFragment {
2525
````
2626

2727
Then define `ColorPickerDialogFragmentImpl` as navigation destination in [`nav_graph.xml`](https://github.com/syslogic/androidx-colorpicker/blob/master/mobile/src/main/res/navigation/nav_graph.xml):
28+
2829
````xml
29-
<dialog
30-
android:id="@+id/colorPickerDialogFragment"
31-
android:name="io.syslogic.demo.colorpicker.fragment.ColorPickerDialogFragmentImpl">
32-
<argument app:argType="integer" android:name="initialColor" android:defaultValue="-16777216"/>
33-
<argument app:argType="boolean" android:name="alphaSlider" android:defaultValue="false"/>
34-
<argument app:argType="boolean" android:name="hexValue" android:defaultValue="false"/>
30+
31+
<dialog android:id="@+id/colorPickerDialogFragment"
32+
android:name="io.syslogic.compose.demo.fragment.colorpicker.ColorPickerDialogFragmentImpl">
33+
<argument app:argType="integer" android:name="initialColor" android:defaultValue="-16777216" />
34+
<argument app:argType="boolean" android:name="alphaSlider" android:defaultValue="false" />
35+
<argument app:argType="boolean" android:name="hexValue" android:defaultValue="false" />
3536
</dialog>
3637
````
3738
Screenshot `ColorPickerDialogFragment`:
@@ -41,7 +42,7 @@ Screenshot `ColorPickerDialogFragment`:
4142
b) [`ColorPickerPreference`](https://github.com/syslogic/androidx-colorpicker/blob/master/library/src/main/java/io/syslogic/colorpicker/ColorPickerPreference.java)
4243
can be added as XML node; into eg. [`preferences.xml`](https://github.com/syslogic/androidx-colorpicker/blob/master/mobile/src/main/res/xml/preferences.xml):
4344
````xml
44-
<io.syslogic.colorpicker.ColorPickerPreference
45+
<io.syslogic.colorpicker.legacy.ColorPickerPreference
4546
android:title="@string/text_select_color"
4647
android:icon="@drawable/ic_baseline_invert_colors"
4748
android:defaultValue="@string/value_default_color"

‎build.gradle.kts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ plugins {
44
alias(libs.plugins.android.library) apply false
55
alias(libs.plugins.androidx.navigation.safeargs) apply false
66
alias(libs.plugins.kotlin.compose.compiler) apply false
7-
alias(libs.plugins.kotlin.android) apply false
8-
alias(libs.plugins.kotlin.kapt) apply false
7+
alias(libs.plugins.builtin.kotlin) apply false
8+
alias(libs.plugins.legacy.kapt) apply false
99
}
1010

1111
tasks.register<Delete>("clean") {
12-
delete(rootProject.fileTree("build"))
13-
delete(project.fileTree("build"))
12+
delete(
13+
rootProject.file("build"),
14+
project.file("build")
15+
)
1416
}

library/.gitignore renamed to compose/.gitignore

File renamed without changes.

library/build.gradle.kts renamed to compose/build.gradle.kts

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,41 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
33
// Module :library
44
plugins {
55
alias(libs.plugins.android.library)
6-
alias(libs.plugins.kotlin.android)
76
alias(libs.plugins.kotlin.compose.compiler)
8-
alias(libs.plugins.kotlin.kapt)
7+
alias(libs.plugins.builtin.kotlin)
8+
alias(libs.plugins.legacy.kapt)
99
id("maven-publish")
1010
}
1111

1212
base {
13-
archivesName = "colorpicker_${libs.versions.app.version.name.get()}"
13+
archivesName = "colorpicker_compose_${libs.versions.app.version.name.get()}"
1414
}
1515

1616
kotlin {
17+
jvmToolchain(17)
1718
compilerOptions {
1819
jvmTarget.set(JvmTarget.JVM_17)
1920
}
2021
}
2122

23+
composeCompiler {
24+
reportsDestination = layout.buildDirectory.dir("compose_compiler")
25+
}
26+
2227
android {
23-
namespace = "io.syslogic.colorpicker"
28+
namespace = "io.syslogic.colorpicker.compose"
2429
buildToolsVersion = libs.versions.android.build.tools.get()
2530
compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
2631

2732
defaultConfig {
2833
minSdk = Integer.parseInt(libs.versions.android.min.sdk.get())
2934
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
30-
consumerProguardFiles("${project.projectDir.absolutePath}/consumer.pro")
35+
consumerProguardFiles(rootProject.file("consumer.pro").absolutePath)
3136
}
3237

3338
sourceSets {
3439
getByName("main") {
35-
java {
36-
srcDir("src/main/java")
37-
}
40+
java.directories.add("src/main/java")
3841
}
3942
}
4043

@@ -43,10 +46,6 @@ android {
4346
targetCompatibility = JavaVersion.VERSION_17
4447
}
4548

46-
composeCompiler {
47-
reportsDestination = layout.buildDirectory.dir("compose_compiler")
48-
}
49-
5049
buildFeatures {
5150
buildConfig = true
5251
dataBinding = true
@@ -118,18 +117,15 @@ val javadoc by tasks.registering(Javadoc::class) {
118117
source = android.sourceSets.getByName("main").java.getSourceFiles()
119118
configurations["implementation"].isCanBeResolved = true
120119

121-
classpath = files(File("${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"))
122-
android.bootClasspath.forEach { classpath += fileTree(it) }
123-
classpath += fileTree(project.file("build/tmp/aarsToJars/").absolutePath)
124-
classpath += configurations.implementation.get() as FileCollection
120+
// classpath = files(File("${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"))
121+
// android.bootClasspath.forEach { classpath += fileTree(it) }
122+
// classpath += fileTree(project.file("build/tmp/aarsToJars/").absolutePath)
123+
// classpath += configurations.implementation.get() as FileCollection
125124
isFailOnError = false
126125

127126
options.verbose()
128127
(options as StandardJavadocDocletOptions).links("https://docs.oracle.com/en/java/javase/17/docs/api/")
129-
(options as StandardJavadocDocletOptions).linksOffline(
130-
"https://developer.android.com/reference",
131-
"${android.sdkDirectory}/docs/reference"
132-
)
128+
// (options as StandardJavadocDocletOptions).linksOffline("https://developer.android.com/reference", "${android.sdkDirectory}/docs/reference")
133129
(options as StandardJavadocDocletOptions).linkSource(true)
134130
(options as StandardJavadocDocletOptions).author(true)
135131

@@ -180,23 +176,22 @@ artifacts {
180176
group = "io.syslogic"
181177
version = libs.versions.app.version.name.get()
182178

183-
184179
afterEvaluate {
185180
publishing {
186181
publications {
187182
register("release", MavenPublication::class) {
188183
from(components.getByName("release"))
189184
groupId = group as String?
190-
artifactId = "androidx-colorpicker"
185+
artifactId = "colorpicker-compose"
191186
version = libs.versions.app.version.name.get()
192187
pom {
193188
name = "Color Picker"
194189
description = "A simple color-picker library for Android"
195-
url = "https://github.com/syslogic/${artifactId}"
190+
url = "https://github.com/syslogic/androidx-colorpicker"
196191
scm {
197-
connection = "scm:git:git://github.com/syslogic/${artifactId}.git"
198-
developerConnection = "scm:git:ssh://github.com/syslogic/${artifactId}.git"
199-
url = "https://github.com/syslogic/${artifactId}/"
192+
connection = "scm:git:git://github.com/syslogic/androidx-colorpicker.git"
193+
developerConnection = "scm:git:ssh://github.com/syslogic/androidx-colorpicker.git"
194+
url = "https://github.com/syslogic/androidx-colorpicker/"
200195
}
201196
}
202197
}

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

File renamed without changes.

0 commit comments

Comments
 (0)