Skip to content

Commit eb20824

Browse files
committed
version 1.1.6
1 parent 59e617c commit eb20824

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
lines changed

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ buildscript {
55
compile_sdk = 33
66
target_sdk = 33
77
min_sdk = 21
8-
agp_version = '7.4.2'
9-
kotlin_version = '1.8.10'
8+
agp_version = '8.0.1'
9+
kotlin_version = '1.8.20'
1010
kotlin_compiler_extension_version = '1.4.2'
11-
compose_version = '1.4.1'
12-
material_version = '1.8.0'
11+
compose_version = '1.4.3'
12+
material_version = '1.9.0'
1313
appcompat_version = '1.6.1'
1414
preference_version = '1.2.0'
15-
core_version = '1.10.0'
15+
core_version = '1.10.1'
1616
nav_version = '2.5.3'
1717
junit_version = '4.13.2'
18-
version_name = '1.1.4'
19-
version_code = 14
18+
version_name = '1.1.6'
19+
version_code = 16
2020
}
2121
}
2222

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip

jitpack.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
jdk:
2-
-openjdk11
3-
1+
# https://jitpack.io/docs/BUILDING/#custom-commands
2+
before_install:
3+
- sdk install java 17.0.7-amzn
4+
- sdk use java 17.0.7-amzn
5+
-

library/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ android {
6363
dependencies {
6464

6565
implementation "com.google.android.material:material:$material_version"
66-
// implementation "com.google.android.material:compose-theme-adapter-3:1.0.13"
66+
// implementation "com.google.android.material:compose-theme-adapter-3:1.0.1"
6767

6868
implementation "androidx.core:core-ktx:$core_version"
6969
implementation "androidx.appcompat:appcompat:$appcompat_version"
7070
implementation "androidx.preference:preference-ktx:$preference_version"
7171
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
72-
// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2'
72+
// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
7373

7474
// https://mvnrepository.com/artifact/androidx.compose
7575
implementation "androidx.compose.ui:ui:$compose_version"
76-
implementation "androidx.compose.material:material:1.3.1"
77-
implementation "androidx.compose.foundation:foundation:1.3.1"
78-
// implementation "androidx.compose.material:material-icons-core:1.3.1"
79-
// implementation 'androidx.compose.material:material-icons-extended:1.3.1'
76+
implementation "androidx.compose.material:material:$compose_version"
77+
implementation "androidx.compose.foundation:foundation:$compose_version"
78+
// implementation "androidx.compose.material:material-icons-core:$compose_version"
79+
// implementation "androidx.compose.material:material-icons-extended:$compose_version"
8080

8181
/* Composable Preview */
8282
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"

mobile/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android {
1919
minSdk min_sdk
2020
}
2121
compileOptions {
22-
sourceCompatibility JavaVersion.VERSION_11.toString()
23-
targetCompatibility JavaVersion.VERSION_11.toString()
22+
sourceCompatibility JavaVersion.VERSION_11
23+
targetCompatibility JavaVersion.VERSION_11
2424
}
2525
kotlinOptions {
2626
jvmTarget = 11
@@ -29,6 +29,7 @@ android {
2929
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
3030
}
3131
buildFeatures {
32+
buildConfig true
3233
dataBinding true
3334
compose true
3435
}
@@ -66,7 +67,7 @@ dependencies {
6667
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
6768

6869
// https://mvnrepository.com/artifact/androidx.compose
69-
implementation "androidx.activity:activity-compose:1.7.0"
70+
implementation "androidx.activity:activity-compose:1.7.1"
7071
implementation "androidx.compose.ui:ui:$compose_version"
7172
implementation "androidx.compose.runtime:runtime:$compose_version"
7273
implementation "androidx.compose.material:material:$compose_version"

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ dependencyResolutionManagement {
2020
}
2121

2222
rootProject.name = "ColorPicker"
23+
2324
include ":library"
2425
include ":mobile"

0 commit comments

Comments
 (0)