Skip to content

chore(ci): update gradle setup action to v4 in workflows #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rosuH merged 3 commits into from
Aug 30, 2025
Merged

chore(ci): update gradle setup action to v4 in workflows #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54bf0bf
fix(bitmap): handle null config in getBytesInPixel by providing defau…
rosuH Aug 30, 2025
8407764
build: upgrade Gradle wrapper to 8.9 and AGP to 8.7.0
rosuH Aug 30, 2025
e36095d
chore(ci): update gradle setup action to v4 in workflows
rosuH Aug 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pr_pre_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/rosuh/easywatermark/utils/bitmap/BitmapUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading