Skip to content

Commit 8ea8674

Browse files
committed
Bumped Kotlin to 2.1.10 and agp to 8.6.1 to make app compatible with cloudy 0.2.7 and made other changes accordingly (like adding kotlin-compose plugin)
1 parent a08dd6b commit 8ea8674

6 files changed

Lines changed: 16 additions & 12 deletions

File tree

app/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.android.application)
33
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.kotlin.compose)
45
alias(libs.plugins.kotlin.kapt)
56
alias(libs.plugins.dagger.hilt)
67
}
@@ -42,9 +43,9 @@ android {
4243
buildFeatures {
4344
compose = true
4445
}
45-
composeOptions {
46-
kotlinCompilerExtensionVersion = "1.5.10"
47-
}
46+
47+
// remove composeOptions.kotlinCompilerExtensionVersion when on Kotlin 2.x
48+
// composeOptions { kotlinCompilerExtensionVersion = "1.5.10" }
4849
packaging {
4950
resources {
5051
excludes += "/META-INF/{AL2.0,LGPL2.1}"

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
alias(libs.plugins.android.application) apply false
44
alias(libs.plugins.android.library) apply false
55
alias(libs.plugins.kotlin.android) apply false
6+
alias(libs.plugins.kotlin.compose) apply false
67
alias(libs.plugins.kotlin.kapt) apply false
78
alias(libs.plugins.dagger.hilt) apply false
89
// id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0-RC3" apply false

gradle/libs.versions.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[versions]
22
activityCompose = "1.9.0"
3-
agp = "8.3.0"
3+
agp = "8.6.1"
44
androidImageCropper = "4.5.0"
55
appcompat = "1.7.0"
66
cloudy = "0.2.7"
77
colorpicker = "1.0.0"
8-
composeBom = "2024.06.00"
8+
composeBom = "2025.05.00"
99
composeScreenshot = "1.0.3"
1010
constraintlayoutCompose = "1.0.1"
1111
coreKtx = "1.13.1"
1212
espressoCore = "3.6.0"
1313
gpuimage = "2.1.0"
14-
hiltAndroid = "2.49"
14+
hiltAndroid = "2.57.1"
1515
hiltNavigationCompose = "1.2.0"
1616
junit = "4.13.2"
1717
junitVersion = "1.2.0"
1818
kotlinxSerializationJson = "1.6.3"
19-
kotlin = "1.9.22"
19+
kotlin = "2.1.10"
2020
lifecycleRuntimeKtx = "2.8.2"
2121
material = "1.12.0"
2222
navigationCompose = "2.7.7"
@@ -59,5 +59,6 @@ material = { module = "com.google.android.material:material", version.ref = "mat
5959
android-application = { id = "com.android.application", version.ref = "agp"}
6060
android-library = { id = "com.android.library", version.ref = "agp"}
6161
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin"}
62+
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin"}
6263
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin"}
6364
dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid"}

quickedit/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.kotlin.compose)
45
alias(libs.plugins.kotlin.kapt)
56
alias(libs.plugins.dagger.hilt)
67
}
@@ -35,9 +36,9 @@ android {
3536
buildFeatures {
3637
compose = true
3738
}
38-
composeOptions {
39-
kotlinCompilerExtensionVersion = "1.5.10"
40-
}
39+
40+
// remove composeOptions.kotlinCompilerExtensionVersion when on Kotlin 2.x
41+
// composeOptions { kotlinCompilerExtensionVersion = "1.5.10" }
4142
}
4243

4344
dependencies {

quickedit/src/main/java/com/abizer_r/quickedit/ui/cropMode/cropperOptions/CropperOptionsFullWidth.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fun CropperOptionsFullWidth(
6161
val cropperOption = cropperOptionList[index]
6262
CropperOptionView(
6363
modifier = Modifier
64-
.animateItemPlacement()
64+
.animateItem()
6565
.padding(horizontal = 4.dp),
6666
cropperOption = cropperOption,
6767
isSelected = index == selectedIndex,

quickedit/src/main/java/com/abizer_r/quickedit/ui/effectsMode/effectsPreview/EffectsPreviewListFullWidth.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fun EffectsPreviewListFullWidth(
6767
val effectItem = effectsList[index]
6868
EffectPreview(
6969
modifier = Modifier
70-
.animateItemPlacement()
70+
.animateItem()
7171
.padding(horizontal = 4.dp),
7272
effectItem = effectItem,
7373
isSelected = index == selectedIndex,

0 commit comments

Comments
 (0)