Skip to content
Draft
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
16 changes: 13 additions & 3 deletions .github/workflows/android-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: 🔑 Create token
uses: actions/create-github-app-token@v2
uses: actions/create-github-app-token@v3
id: app-token
with:
app-id: ${{ secrets.GH_APP_ID}}
Expand All @@ -32,7 +32,7 @@ jobs:
cache: 'gradle'

- name: 📦 Setup Android SDK
uses: android-actions/setup-android@v3
uses: android-actions/setup-android@v4

- name: 🧹 Check format
run: |
Expand Down Expand Up @@ -70,4 +70,14 @@ jobs:
releaseName: ${{ steps.release.outputs.new_release_version }}
status: draft
mappingFile: app/build/outputs/mapping/release/mapping.txt
debugSymbols: app/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib
debugSymbols: app/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib

- name: 🖥️ Update website
if: steps.release.outputs.new_release_published == 'true' && !steps.release.outputs.new_release_channel && steps.release.outputs.new_release_patch_version == '0'
uses: pawcoding/update-project-action@v0.0.5
with:
pocketbase-url: ${{ vars.PB_URL }}
collection-id: ${{ vars.PB_COLLECTION }}
record-id: ${{ vars.PB_RECORD }}
env:
PB_TOKEN: ${{ secrets.PB_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Copilot Setup Steps"
name: 'Copilot Setup Steps'

# Automatically run the setup steps when they are changed to allow for easy validation
on:
Expand Down Expand Up @@ -29,12 +29,12 @@ jobs:
- name: 📦 Setup JDK
uses: actions/setup-java@v5
with:
distribution: "temurin"
java-version: "21"
cache: "gradle"
distribution: 'temurin'
java-version: '21'
cache: 'gradle'

- name: 📦 Setup Android SDK
uses: android-actions/setup-android@v3
uses: android-actions/setup-android@v4

- name: 🧹 Initialize formatter
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Test
on:
push:
branches:
- "**"
- "!master"
- "!staging"
- '**'
- '!master'
- '!staging'

jobs:
release:
Expand All @@ -20,12 +20,12 @@ jobs:
- name: 📦 Setup JDK
uses: actions/setup-java@v5
with:
distribution: "temurin"
java-version: "21"
cache: "gradle"
distribution: 'temurin'
java-version: '21'
cache: 'gradle'

- name: 📦 Setup Android SDK
uses: android-actions/setup-android@v3
uses: android-actions/setup-android@v4

- name: 🧹 Check format
run: |
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.jetbrains.kotlin.serialization)
id("com.google.devtools.ksp") version "2.3.6"
id("com.ncorti.ktfmt.gradle") version "0.25.0"
id("com.ncorti.ktfmt.gradle") version "0.26.0"
}

android {
Expand Down Expand Up @@ -62,8 +62,8 @@ android {
}

buildFeatures {
compose = true
resValues = true
compose = true
resValues = true
}

androidResources { generateLocaleConfig = true }
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[versions]
activityCompose = "1.12.4"
agp = "9.0.1"
activityCompose = "1.13.0"
agp = "9.1.0"
barcodeScanning = "17.3.0"
biometric = "1.1.0"
colorpickerCompose = "1.1.3"
composeBom = "2026.02.00"
composeBom = "2026.03.01"
composedBarcodes = "1.3.0"
coreKtx = "1.17.0"
coreKtx = "1.18.0"
coreSplashscreen = "1.2.0"
datastorePreferences = "1.2.0"
datastorePreferences = "1.2.1"
espressoCore = "3.7.0"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.3.10"
kotlinSerialization = "2.3.10"
kotlin = "2.3.20"
kotlinSerialization = "2.3.20"
kotlinxSerialization = "1.10.0"
lifecycleRuntimeKtx = "2.10.0"
lifecycleViewmodelNav3 = "2.10.0"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew

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

4 changes: 2 additions & 2 deletions version.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VERSION_CODE=64
VERSION_NAME=1.5.0
VERSION_CODE=67
VERSION_NAME=1.5.1-staging.3