Skip to content

Commit 7485eef

Browse files
committed
dependencies updated; few hyper-links added.
1 parent de1c9ef commit 7485eef

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ c) Preview: `@Composable fun` [`ColorPickerComponent`](https://github.com/syslog
6060

6161
d) Preview: `@Composable fun` [`ColorPickerDialog`](https://github.com/syslogic/androidx-colorpicker/blob/master/library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerDialog.kt)
6262

63-
![Composable](https://raw.githubusercontent.com/syslogic/androidx-colorpicker/master/screenshots/screenshot_03.png)
63+
![Composable](https://raw.githubusercontent.com/syslogic/androidx-colorpicker/master/screenshots/screenshot_03.png)

build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
// Root project build.gradle
22
buildscript {
33
ext {
4-
build_tools_version = '33.0.2'
5-
compile_sdk = 33
6-
target_sdk = 33
4+
compile_sdk = 34
5+
target_sdk = 34
76
min_sdk = 21
8-
agp_version = '8.0.1'
9-
kotlin_version = '1.8.10'
10-
kotlin_compiler_extension_version = '1.4.2'
7+
agp_version = '8.0.2'
8+
kotlin_version = '1.8.22'
9+
kotlin_compiler_extension_version = '1.4.8'
1110
compose_version = '1.4.3'
1211
material_version = '1.9.0'
1312
appcompat_version = '1.6.1'
1413
preference_version = '1.2.0'
1514
core_version = '1.10.1'
16-
nav_version = '2.5.3'
15+
nav_version = '2.6.0'
1716
junit_version = '4.13.2'
1817
version_name = '1.1.6'
1918
version_code = 16

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Project-wide Gradle settings.
22
systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false
33
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
4+
5+
android.suppressUnsupportedCompileSdk=34
46
android.enableJetifier=false
57
android.useAndroidX=true

library/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ android {
1010
compileSdk compile_sdk
1111
namespace 'io.syslogic.colorpicker'
1212
defaultConfig {
13-
minSdk min_sdk
14-
targetSdk target_sdk
15-
buildToolsVersion build_tools_version
1613
setProperty('archivesBaseName', 'colorpicker')
1714
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1815
consumerProguardFiles "${project.rootDir}/proguard/consumer.pro"
16+
targetSdk target_sdk
17+
minSdk min_sdk
1918
}
2019
compileOptions {
2120
sourceCompatibility JavaVersion.VERSION_17

mobile/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ android {
1212
namespace "io.syslogic.demo.colorpicker"
1313
applicationId "io.syslogic.demo.colorpicker"
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
15-
buildToolsVersion build_tools_version
1615
versionCode version_code
1716
versionName version_name
1817
targetSdk target_sdk
@@ -26,6 +25,8 @@ android {
2625
jvmTarget = 17
2726
}
2827
composeOptions {
28+
// See the "Compose to Kotlin Compatibility Map" for compatible versions:
29+
// https://developer.android.com/jetpack/androidx/releases/compose-kotlin
2930
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
3031
}
3132
buildFeatures {
@@ -52,7 +53,7 @@ android {
5253

5354
dependencies {
5455

55-
// Either Jitpack repository or project module :library.
56+
// Use either Jitpack repository or project module :library (local).
5657
// implementation "io.syslogic:androidx-colorpicker:$version_name"
5758
implementation project(path: ':library')
5859

@@ -62,12 +63,14 @@ dependencies {
6263
implementation "androidx.appcompat:appcompat:$appcompat_version"
6364
implementation "androidx.preference:preference-ktx:$preference_version"
6465

66+
androidTestImplementation "androidx.navigation:navigation-testing:$nav_version"
6567
implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"
6668
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
6769
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
6870

6971
// https://mvnrepository.com/artifact/androidx.compose
70-
implementation "androidx.activity:activity-compose:1.7.1"
72+
// https://developer.android.com/jetpack/androidx/releases/compose
73+
implementation "androidx.activity:activity-compose:1.7.2"
7174
implementation "androidx.compose.ui:ui:$compose_version"
7275
implementation "androidx.compose.runtime:runtime:$compose_version"
7376
implementation "androidx.compose.material:material:$compose_version"
@@ -76,7 +79,6 @@ dependencies {
7679

7780
testImplementation "junit:junit:$junit_version"
7881
androidTestImplementation "androidx.test.ext:junit:1.1.5"
79-
androidTestImplementation "androidx.navigation:navigation-testing:$nav_version"
8082
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
8183
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
8284

0 commit comments

Comments
 (0)