Skip to content

Commit 9d9fb83

Browse files
committed
build fixed.
1 parent eb20824 commit 9d9fb83

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
target_sdk = 33
77
min_sdk = 21
88
agp_version = '8.0.1'
9-
kotlin_version = '1.8.20'
9+
kotlin_version = '1.8.10'
1010
kotlin_compiler_extension_version = '1.4.2'
1111
compose_version = '1.4.3'
1212
material_version = '1.9.0'

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Project-wide Gradle settings.
22
systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false
33
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
4-
android.disableAutomaticComponentCreation=true
54
android.enableJetifier=false
65
android.useAndroidX=true

library/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ android {
1818
consumerProguardFiles "${project.rootDir}/proguard/consumer.pro"
1919
}
2020
compileOptions {
21-
sourceCompatibility JavaVersion.VERSION_11.toString()
22-
targetCompatibility JavaVersion.VERSION_11.toString()
21+
sourceCompatibility JavaVersion.VERSION_17
22+
targetCompatibility JavaVersion.VERSION_17
2323
}
2424
kotlinOptions {
25-
jvmTarget = 11
25+
jvmTarget = 17
2626
}
2727
composeOptions {
2828
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
@@ -32,6 +32,7 @@ android {
3232
resources.pickFirsts.add('META-INF/AL2.0')
3333
}
3434
buildFeatures {
35+
buildConfig true
3536
dataBinding true
3637
compose true
3738
}

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 = R.color.cardview_light_background),
58+
color = colorResource(id = com.google.android.material.R.color.cardview_light_background),
5959
modifier = Modifier
6060
.layoutId(DialogSurface)
6161
.testTag("dialog_surface")

mobile/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ android {
1919
minSdk min_sdk
2020
}
2121
compileOptions {
22-
sourceCompatibility JavaVersion.VERSION_11
23-
targetCompatibility JavaVersion.VERSION_11
22+
sourceCompatibility JavaVersion.VERSION_17
23+
targetCompatibility JavaVersion.VERSION_17
2424
}
2525
kotlinOptions {
26-
jvmTarget = 11
26+
jvmTarget = 17
2727
}
2828
composeOptions {
2929
kotlinCompilerExtensionVersion kotlin_compiler_extension_version

0 commit comments

Comments
 (0)