Skip to content

Commit 6a565f7

Browse files
syslogicsyslogic
committed
AGP 8.13.0
1 parent 94a5d17 commit 6a565f7

File tree

7 files changed

+93
-95
lines changed

7 files changed

+93
-95
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Project-wide Gradle settings.
22
# @see https://docs.gradle.org/current/userguide/build_environment.html
33
org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
4+
org.gradle.configuration-cache=true
45
org.gradle.configureondemand=false
56
org.gradle.parallel=false
67

‎gradle/libs.versions.toml‎

Lines changed: 70 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,84 @@
11
[versions]
2-
app_version_code = '29'
3-
app_version_name = '1.3.0'
4-
android_build_tools = '35.0.0'
5-
android_compile_sdk = '36'
6-
android_target_sdk = '36'
7-
android_min_sdk = '21'
2+
app_version_code = "32"
3+
app_version_name = "1.3.2"
4+
android_build_tools = "36.0.0"
5+
android_compile_sdk = "36"
6+
android_target_sdk = "36"
7+
android_min_sdk = "23"
88

99
# Gradle Plugins
10-
android_gradle_plugin = '8.12.0'
11-
material_design = '1.12.0'
12-
junit = '4.13.2'
13-
kotlin = '2.2.0'
10+
android_gradle_plugin = "8.13.0"
11+
material_design = "1.13.0"
12+
junit = "4.13.2"
13+
kotlin = "2.2.20"
1414

15-
androidx_compose_bom = '2025.07.00'
16-
androidx_compose_uitest = '1.8.3'
17-
androidx_core = '1.16.0'
18-
androidx_appcompat = '1.7.1'
19-
androidx_navigation = '2.9.3'
20-
androidx_preference = '1.2.1'
15+
androidx_compose_bom = "2025.09.00"
16+
androidx_compose_uitest = "1.9.1"
17+
androidx_core = "1.17.0"
18+
androidx_appcompat = "1.7.1"
19+
androidx_navigation = "2.9.4"
20+
androidx_navigation3 = "1.0.0-alpha09"
21+
androidx_preference = "1.2.1"
2122

22-
androidx_test_ext_junit = '1.3.0'
23-
androidx_test_core = '1.7.0'
24-
androidx_test_rules = '1.7.0'
25-
androidx_test_runner = '1.7.0'
26-
androidx_test_monitor = '1.8.0'
27-
androidx_test_espresso = '3.7.0'
28-
androidx_test_uiautomator = '2.3.0'
23+
androidx_test_ext_junit = "1.3.0"
24+
androidx_test_core = "1.7.0"
25+
androidx_test_rules = "1.7.0"
26+
androidx_test_runner = "1.7.0"
27+
androidx_test_monitor = "1.8.0"
28+
androidx_test_espresso = "3.7.0"
29+
androidx_test_uiautomator = "2.3.0"
2930

3031
[plugins]
31-
androidx_navigation_safeargs = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" }
32-
android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }
33-
android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }
34-
kotlin_compose_compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
35-
kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
36-
kotlin_kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
32+
androidx_navigation_safeargs = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" }
33+
android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }
34+
android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }
35+
kotlin_compose_compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
36+
kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
37+
kotlin_kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
3738

3839
[libraries]
39-
kotlin_stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
40-
material_design = { module = "com.google.android.material:material", version.ref = "material_design" }
41-
junit = { module = "junit:junit", version.ref = "junit" }
42-
androidx_core_ktx = { module = "androidx.core:core-ktx", version.ref = "androidx_core" }
43-
androidx_appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx_appcompat" }
44-
androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "androidx_compose_bom" }
45-
androidx_compose_uitest = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx_compose_uitest" }
46-
androidx_compose_foundation = { module = "androidx.compose.foundation:foundation" }
47-
androidx_compose_material = { module = "androidx.compose.material:material" }
48-
androidx_compose_ui = { module = "androidx.compose.ui:ui" }
49-
androidx_compose_activity = { module = "androidx.activity:activity-compose" }
50-
androidx_compose_runtime = { module = "androidx.compose.runtime:runtime" }
51-
androidx_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" }
40+
kotlin_stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
41+
material_design = { module = "com.google.android.material:material", version.ref = "material_design" }
42+
junit = { module = "junit:junit", version.ref = "junit" }
43+
androidx_core_ktx = { module = "androidx.core:core-ktx", version.ref = "androidx_core" }
44+
androidx_appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx_appcompat" }
45+
androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "androidx_compose_bom" }
46+
androidx_compose_uitest = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx_compose_uitest" }
47+
androidx_compose_foundation = { module = "androidx.compose.foundation:foundation" }
48+
androidx_compose_material = { module = "androidx.compose.material:material" }
49+
androidx_compose_ui = { module = "androidx.compose.ui:ui" }
50+
androidx_compose_activity = { module = "androidx.activity:activity-compose" }
51+
androidx_compose_runtime = { module = "androidx.compose.runtime:runtime" }
52+
androidx_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" }
53+
androidx_compose_uitest_manifest = { module = "androidx.compose.ui:ui-test-manifest" }
5254
androidx_customview_poolingcontainer = { module = "androidx.customview:customview-poolingcontainer" }
5355
androidx_compose_material_icons_core = { module = "androidx.compose.material:material-icons-core" }
5456
# androidx_compose_material_icons_extended = { module = "androidx.compose.material:material-icons-extended" }
55-
androidx_preference_ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx_preference" }
56-
androidx_navigation_testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidx_navigation" }
57-
androidx_navigation_runtime_ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "androidx_navigation" }
58-
androidx_navigation_fragment_ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx_navigation" }
59-
androidx_navigation_ui_ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx_navigation" }
60-
androidx_test_monitor = { module = "androidx.test:monitor", version.ref = "androidx_test_monitor" }
61-
androidx_test_ext_junit = { module = "androidx.test.ext:junit", version.ref = "androidx_test_ext_junit" }
62-
androidx_test_core = { module = "androidx.test:core", version.ref = "androidx_test_core" }
63-
androidx_test_rules = { module = "androidx.test:rules", version.ref = "androidx_test_rules" }
64-
androidx_test_runner = { module = "androidx.test:runner", version.ref = "androidx_test_runner" }
65-
androidx_test_uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx_test_uiautomator" }
66-
androidx_espresso_core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
67-
androidx_espresso_web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }
68-
# androidx_espresso_accessibility = { module = "androidx.test.espresso:espresso-accessibility", version.ref = "androidx_test_espresso" }
69-
# androidx_espresso_idling_resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "androidx_test_espresso" }
70-
# androidx_espresso_idling_concurrent = { module = "androidx.test.espresso.idling:idling-concurrent", version.ref = "androidx_test_espresso" }
71-
# androidx_espresso_contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx_test_espresso" }
72-
# androidx_espresso_intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidx_test_espresso" }
57+
androidx_preference_ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx_preference" }
58+
androidx_navigation3_runtime = { module = "androidx.navigation3:navigation3-runtime-android", version.ref = "androidx_navigation3" }
59+
androidx_navigation3_ui = { module = "androidx.navigation3:navigation3-ui-android", version.ref = "androidx_navigation3" }
60+
# androidx_navigation_testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidx_navigation" }
61+
# androidx_navigation_runtime_ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "androidx_navigation" }
62+
androidx_navigation_fragment_ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx_navigation" }
63+
androidx_navigation_ui_ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx_navigation" }
64+
androidx_test_monitor = { module = "androidx.test:monitor", version.ref = "androidx_test_monitor" }
65+
androidx_test_ext_junit = { module = "androidx.test.ext:junit", version.ref = "androidx_test_ext_junit" }
66+
androidx_test_core = { module = "androidx.test:core", version.ref = "androidx_test_core" }
67+
androidx_test_rules = { module = "androidx.test:rules", version.ref = "androidx_test_rules" }
68+
androidx_test_runner = { module = "androidx.test:runner", version.ref = "androidx_test_runner" }
69+
androidx_test_uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx_test_uiautomator" }
70+
androidx_espresso_core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
71+
androidx_espresso_web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }
72+
# androidx_espresso_accessibility = { module = "androidx.test.espresso:espresso-accessibility", version.ref = "androidx_test_espresso" }
73+
# androidx_espresso_idling_resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "androidx_test_espresso" }
74+
# androidx_espresso_idling_concurrent= { module = "androidx.test.espresso.idling:idling-concurrent", version.ref = "androidx_test_espresso" }
75+
# androidx_espresso_contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx_test_espresso" }
76+
# androidx_espresso_intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidx_test_espresso" }
7377

7478
[bundles]
75-
androidx_compose_tooling = ["androidx_compose_ui_tooling", "androidx_customview_poolingcontainer"]
76-
androidx_compose_lib = ["androidx_compose_foundation", "androidx_compose_material", "androidx_compose_ui", "androidx_compose_material_icons_core"]
77-
androidx_compose_app = ["androidx_compose_foundation", "androidx_compose_material", "androidx_compose_ui", "androidx_compose_activity", "androidx_compose_runtime"]
78-
androidx_test = ["androidx_test_ext_junit", "androidx_test_core", "androidx_test_rules", "androidx_test_runner", "androidx_test_uiautomator"]
79-
androidx_espresso = ["androidx_espresso_core", "androidx_espresso_web"]
79+
androidx_compose_tooling = ["androidx_compose_ui_tooling", "androidx_customview_poolingcontainer"]
80+
androidx_compose_lib = ["androidx_compose_foundation", "androidx_compose_material", "androidx_compose_ui", "androidx_compose_material_icons_core"]
81+
androidx_compose_app = ["androidx_compose_foundation", "androidx_compose_material", "androidx_compose_ui", "androidx_compose_activity", "androidx_compose_runtime"]
82+
androidx_navigation3 = ["androidx_navigation3_runtime", "androidx_navigation3_ui"]
83+
androidx_test = ["androidx_test_ext_junit", "androidx_test_core", "androidx_test_rules", "androidx_test_runner", "androidx_test_uiautomator"]
84+
androidx_espresso = ["androidx_espresso_core", "androidx_espresso_web"]

‎library/build.gradle.kts‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,16 @@ plugins {
99
id("maven-publish")
1010
}
1111

12+
base {
13+
archivesName = "colorpicker_${libs.versions.app.version.name.get()}"
14+
}
15+
1216
kotlin {
1317
compilerOptions {
14-
jvmTarget = JvmTarget.JVM_17
15-
freeCompilerArgs.addAll(
16-
listOf("-Xlint:unchecked", "-Xlint:deprecation")
17-
)
18+
jvmTarget.set(JvmTarget.JVM_17)
1819
}
1920
}
2021

21-
base {
22-
archivesName = "colorpicker_${libs.versions.app.version.name.get()}"
23-
}
24-
2522
android {
2623
namespace = "io.syslogic.colorpicker"
2724
buildToolsVersion = libs.versions.android.build.tools.get()
@@ -189,12 +186,9 @@ afterEvaluate {
189186
publications {
190187
register("release", MavenPublication::class) {
191188
from(components.getByName("release"))
192-
193189
groupId = group as String?
194190
artifactId = "androidx-colorpicker"
195191
version = libs.versions.app.version.name.get()
196-
197-
198192
pom {
199193
name = "Color Picker"
200194
description = "A simple color-picker library for Android"

‎library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fun ColorPickerDialog(
5555
) {
5656
Surface(
5757
shape = RoundedCornerShape(dimensionResource(R.dimen.compose_dialog_border_radius)),
58-
color = colorResource(id = com.google.android.material.R.color.cardview_light_background),
58+
color = colorResource(id = com.google.android.material.R.color.design_default_color_background),
5959
modifier = Modifier
6060
.layoutId(DialogSurface)
6161
.testTag("dialog_surface")

‎mobile/build.gradle.kts‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,16 @@ plugins {
99
alias(libs.plugins.kotlin.kapt)
1010
}
1111

12+
base {
13+
archivesName = "colorpicker_demo_${libs.versions.app.version.name.get()}"
14+
}
15+
1216
kotlin {
1317
compilerOptions {
14-
jvmTarget = JvmTarget.JVM_17
15-
freeCompilerArgs.addAll(
16-
listOf("-Xlint:unchecked", "-Xlint:deprecation")
17-
)
18+
jvmTarget.set(JvmTarget.JVM_17)
1819
}
1920
}
2021

21-
base {
22-
archivesName = "colorpicker_demo_${libs.versions.app.version.name.get()}"
23-
}
24-
2522
android {
2623
namespace = "io.syslogic.demo.colorpicker"
2724
buildToolsVersion = libs.versions.android.build.tools.get()
@@ -92,18 +89,21 @@ dependencies {
9289

9390
implementation(libs.material.design)
9491
implementation(libs.androidx.core.ktx)
95-
implementation(libs.androidx.appcompat)
9692
implementation(libs.androidx.preference.ktx)
93+
implementation(libs.androidx.appcompat)
9794

98-
androidTestImplementation(libs.androidx.navigation.testing)
99-
implementation(libs.androidx.navigation.runtime.ktx)
100-
implementation(libs.androidx.navigation.fragment.ktx)
101-
implementation(libs.androidx.navigation.ui.ktx)
95+
// androidTestImplementation(libs.androidx.navigation.testing)
96+
// implementation(libs.androidx.navigation.fragment.ktx)
97+
// implementation(libs.androidx.navigation.runtime.ktx)
98+
// implementation(libs.androidx.navigation.ui.ktx)
99+
implementation(libs.bundles.androidx.navigation3)
102100

103101
// https://mvnrepository.com/artifact/androidx.compose
104102
// https://developer.android.com/jetpack/compose/tooling#bom
105103
implementation(platform(libs.androidx.compose.bom))
106104
implementation(libs.bundles.androidx.compose.app)
105+
implementation(libs.androidx.navigation.fragment.ktx)
106+
implementation(libs.androidx.navigation.ui.ktx)
107107

108108
// jUnit
109109
testImplementation(libs.junit)
@@ -128,8 +128,7 @@ dependencies {
128128
androidTestImplementation(libs.androidx.compose.uitest)
129129

130130
// Needed for createComposeRule, but not createAndroidComposeRule:
131-
//noinspection UseTomlInstead,GradleDependency
132-
debugImplementation("androidx.compose.ui:ui-test-manifest")
131+
debugImplementation(libs.androidx.compose.uitest.manifest)
133132
}
134133

135134
// disable caching

‎mobile/src/androidTest/java/io/syslogic/demo/colorpicker/TestComposeActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import org.junit.runner.RunWith
1414
* Compose Activity Test Case
1515
* @author Martin Zeitler
1616
*/
17-
@Deprecated("kept for reference")
1817
@RunWith(AndroidJUnit4::class)
19-
class TestComposeActivity {
18+
@Deprecated("kept for reference")
19+
class TestComposeActivity : TestSuite() {
2020

2121
@get:Rule
2222
val testRule: AndroidComposeTestRule<ActivityScenarioRule<ComposeActivity>, ComposeActivity> =

‎mobile/src/androidTest/java/io/syslogic/demo/colorpicker/TestSuite.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
* Test Suite
2626
* @author Martin Zeitler
2727
*/
28-
@RunWith(org.junit.runners.Suite.class)
2928
@SuiteClasses({
3029
TestColorPicker.class,
3130
TestComposeContent.class

0 commit comments

Comments
 (0)