Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
echo "$((major * 10000 + minor * 100 + patch))" > versionCode.txt

- name: Create GitHub Release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
tag_name: ${{ steps.version.outputs.new_tag }}
files: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
sudo udevadm trigger --name-match=kvm

- name: Cache AVD snapshot
uses: actions/cache@v4
uses: actions/cache@v5
id: avd-cache
with:
path: |
Expand Down
4 changes: 4 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ configurations.all {
val group = requested.group
val name = requested.name
when {
// coroutines-test 1.11.0 calls APIs added in coroutines-core 1.11.0; force the
// core to match so instrumented tests don't see a stale version from transitive deps.
group == "org.jetbrains.kotlinx" && name.startsWith("kotlinx-coroutines-") ->
useVersion(libs.versions.coroutinesTest.get())
group == "io.netty" -> useVersion("4.1.129.Final")
group == "com.google.protobuf" && name == "protobuf-kotlin" -> useVersion("3.25.5")
group == "com.google.protobuf" && name == "protobuf-java" -> useVersion("3.25.5")
Expand Down
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[versions]
gradlePlayPublisher = "3.12.1"
gradlePlayPublisher = "3.13.0"
agp = "8.13.2"
coreKtx = "1.18.0"
junit = "4.13.2"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
mockk = "1.13.12"
coroutinesTest = "1.9.0"
mockk = "1.14.9"
coroutinesTest = "1.11.0"
lifecycleRuntimeKtx = "2.10.0"
activityCompose = "1.13.0"
kotlin = "2.3.10"
kotlin = "2.3.21"
composeBom = "2024.12.01"
roomKtx = "2.8.4"
ksp = "2.3.7"
serialization = "1.10.0"
ksp = "2.3.8"
serialization = "1.11.0"
navigationCompose = "2.9.8"
zxing = "3.5.4"
cameraX = "1.5.3"
jsoup = "1.22.1"
ktor = "3.4.1"
cameraX = "1.6.1"
jsoup = "1.22.2"
ktor = "3.4.2"
coil = "2.7.0"

[libraries]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionSha256Sum=553c78f50dafcd54d65b9a444649057857469edf836431389695608536d6b746
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 10 additions & 21 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading