Skip to content

Commit 5adda54

Browse files
authored
bump target sdk version to 35 (#357)
* fix(bitmap): handle null config in getBytesInPixel by providing default ARGB_8888 Also update SDK and versioning to target and support Android SDK 35 > GENERATE BY https://aicommit.app * build: upgrade Gradle wrapper to 8.9 and AGP to 8.7.0 > GENERATE BY https://aicommit.app
1 parent 1c2e9e4 commit 5adda54

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ android {
1616
applicationId = "me.rosuh.easywatermark"
1717
minSdk = (Apps.minSdk)
1818
targetSdk = (Apps.targetSdk)
19-
versionCode = 20905
20-
versionName = "2.9.5"
19+
versionCode = 20906
20+
versionName = "2.9.6"
2121
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2222
}
2323

app/src/main/java/me/rosuh/easywatermark/utils/bitmap/BitmapUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ private fun canUseForInBitmap(
306306
): Boolean {
307307
val width = targetOptions.outWidth / targetOptions.inSampleSize
308308
val height = targetOptions.outHeight / targetOptions.inSampleSize
309-
val byteCount = width * height * getBytesInPixel(candidate.config)
309+
val byteCount = width * height * getBytesInPixel(candidate.config ?: Bitmap.Config.ARGB_8888)
310310
return byteCount <= candidate.allocationByteCount
311311
}
312312

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Apps {
2-
const val compileSdk = 34
3-
const val buildTools = "34.0.0"
2+
const val compileSdk = 35
3+
const val buildTools = "35.0.0"
44
const val minSdk = 23
5-
const val targetSdk = 34
5+
const val targetSdk = 35
66
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.1.2"
2+
agp = "8.7.0"
33
kotlin = "1.9.10"
44
ksp = "1.9.10-1.0.13"
55
hilt = "2.48.1"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Jul 22 12:02:18 CST 2023
1+
#Sat Aug 30 10:17:59 CST 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)