File tree Expand file tree Collapse file tree 5 files changed +9
-9
lines changed
src/main/java/io/syslogic/colorpicker/compose Expand file tree Collapse file tree 5 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ buildscript {
6
6
target_sdk = 33
7
7
min_sdk = 21
8
8
agp_version = ' 8.0.1'
9
- kotlin_version = ' 1.8.20 '
9
+ kotlin_version = ' 1.8.10 '
10
10
kotlin_compiler_extension_version = ' 1.4.2'
11
11
compose_version = ' 1.4.3'
12
12
material_version = ' 1.9.0'
Original file line number Diff line number Diff line change 1
1
# Project-wide Gradle settings.
2
2
systemProp.org.gradle.internal.launcher.welcomeMessageEnabled =false
3
3
org.gradle.jvmargs =-Xmx2048m -Dfile.encoding=UTF-8
4
- android.disableAutomaticComponentCreation =true
5
4
android.enableJetifier =false
6
5
android.useAndroidX =true
Original file line number Diff line number Diff line change @@ -18,11 +18,11 @@ android {
18
18
consumerProguardFiles " ${ project.rootDir} /proguard/consumer.pro"
19
19
}
20
20
compileOptions {
21
- sourceCompatibility JavaVersion . VERSION_11 . toString()
22
- targetCompatibility JavaVersion . VERSION_11 . toString()
21
+ sourceCompatibility JavaVersion . VERSION_17
22
+ targetCompatibility JavaVersion . VERSION_17
23
23
}
24
24
kotlinOptions {
25
- jvmTarget = 11
25
+ jvmTarget = 17
26
26
}
27
27
composeOptions {
28
28
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
@@ -32,6 +32,7 @@ android {
32
32
resources. pickFirsts. add(' META-INF/AL2.0' )
33
33
}
34
34
buildFeatures {
35
+ buildConfig true
35
36
dataBinding true
36
37
compose true
37
38
}
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ fun ColorPickerDialog(
55
55
) {
56
56
Surface (
57
57
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),
59
59
modifier = Modifier
60
60
.layoutId(DialogSurface )
61
61
.testTag(" dialog_surface" )
Original file line number Diff line number Diff line change @@ -19,11 +19,11 @@ android {
19
19
minSdk min_sdk
20
20
}
21
21
compileOptions {
22
- sourceCompatibility JavaVersion . VERSION_11
23
- targetCompatibility JavaVersion . VERSION_11
22
+ sourceCompatibility JavaVersion . VERSION_17
23
+ targetCompatibility JavaVersion . VERSION_17
24
24
}
25
25
kotlinOptions {
26
- jvmTarget = 11
26
+ jvmTarget = 17
27
27
}
28
28
composeOptions {
29
29
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
You can’t perform that action at this time.
0 commit comments