diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml index f0edce1..699e951 100644 --- a/.github/workflows/android-release.yaml +++ b/.github/workflows/android-release.yaml @@ -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}} @@ -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: | @@ -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 \ No newline at end of file + 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 }} diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index 4d87ed3..2cfc411 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -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: @@ -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: | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fafeb7c..c7ec10a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -3,9 +3,9 @@ name: Test on: push: branches: - - "**" - - "!master" - - "!staging" + - '**' + - '!master' + - '!staging' jobs: release: @@ -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: | diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 253d4ea..8ad5d59 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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 { @@ -62,8 +62,8 @@ android { } buildFeatures { - compose = true - resValues = true + compose = true + resValues = true } androidResources { generateLocaleConfig = true } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 688184c..213bbd4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 61285a6..d997cfc 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6..c61a118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index adff685..739907d 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/version.properties b/version.properties index 76af643..142b8ba 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -VERSION_CODE=64 -VERSION_NAME=1.5.0 \ No newline at end of file +VERSION_CODE=67 +VERSION_NAME=1.5.1-staging.3 \ No newline at end of file