From 54bf0bf8a7c9e516b551282080ed43f5cb43afbc Mon Sep 17 00:00:00 2001 From: rosuH Date: Sat, 30 Aug 2025 09:54:21 +0800 Subject: [PATCH 1/3] 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 --- app/build.gradle.kts | 4 ++-- .../java/me/rosuh/easywatermark/utils/bitmap/BitmapUtils.kt | 2 +- buildSrc/src/main/kotlin/Dependencies.kt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 46abda37..eb62fea0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,8 +16,8 @@ android { applicationId = "me.rosuh.easywatermark" minSdk = (Apps.minSdk) targetSdk = (Apps.targetSdk) - versionCode = 20905 - versionName = "2.9.5" + versionCode = 20906 + versionName = "2.9.6" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/me/rosuh/easywatermark/utils/bitmap/BitmapUtils.kt b/app/src/main/java/me/rosuh/easywatermark/utils/bitmap/BitmapUtils.kt index de217440..1eb5b3b2 100644 --- a/app/src/main/java/me/rosuh/easywatermark/utils/bitmap/BitmapUtils.kt +++ b/app/src/main/java/me/rosuh/easywatermark/utils/bitmap/BitmapUtils.kt @@ -306,7 +306,7 @@ private fun canUseForInBitmap( ): Boolean { val width = targetOptions.outWidth / targetOptions.inSampleSize val height = targetOptions.outHeight / targetOptions.inSampleSize - val byteCount = width * height * getBytesInPixel(candidate.config) + val byteCount = width * height * getBytesInPixel(candidate.config ?: Bitmap.Config.ARGB_8888) return byteCount <= candidate.allocationByteCount } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 397ec0ab..0f692cad 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,6 +1,6 @@ object Apps { - const val compileSdk = 34 - const val buildTools = "34.0.0" + const val compileSdk = 35 + const val buildTools = "35.0.0" const val minSdk = 23 - const val targetSdk = 34 + const val targetSdk = 35 } \ No newline at end of file From 8407764de806257722bb2837b3a13dac6738f19b Mon Sep 17 00:00:00 2001 From: rosuH Date: Sat, 30 Aug 2025 10:20:43 +0800 Subject: [PATCH 2/3] build: upgrade Gradle wrapper to 8.9 and AGP to 8.7.0 > GENERATE BY https://aicommit.app --- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4ceb225..65033022 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.1.2" +agp = "8.7.0" kotlin = "1.9.10" ksp = "1.9.10-1.0.13" hilt = "2.48.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 55dfdee9..a249ab5d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jul 22 12:02:18 CST 2023 +#Sat Aug 30 10:17:59 CST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From e36095daf0d8394f827df1cb17a593c737c9a2ae Mon Sep 17 00:00:00 2001 From: rosuH Date: Sat, 30 Aug 2025 10:36:13 +0800 Subject: [PATCH 3/3] chore(ci): update gradle setup action to v4 in workflows > GENERATE BY https://aicommit.app --- .github/workflows/pr_pre_check.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr_pre_check.yml b/.github/workflows/pr_pre_check.yml index 89580b81..5943d591 100644 --- a/.github/workflows/pr_pre_check.yml +++ b/.github/workflows/pr_pre_check.yml @@ -24,7 +24,7 @@ jobs: distribution: 'zulu' java-version: 17 cache: 'gradle' - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: gradle-version: wrapper gradle-home-cache-cleanup: true @@ -40,7 +40,7 @@ jobs: distribution: 'zulu' java-version: 17 cache: 'gradle' - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: gradle-version: wrapper gradle-home-cache-cleanup: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee5675de..629a94a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: distribution: 'zulu' java-version: 17 cache: 'gradle' - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: gradle-version: wrapper gradle-home-cache-cleanup: true @@ -57,7 +57,7 @@ jobs: distribution: 'zulu' java-version: 17 cache: 'gradle' - - uses: gradle/actions/setup-gradle@v3 + - uses: gradle/actions/setup-gradle@v4 with: gradle-version: wrapper gradle-home-cache-cleanup: true