62 Commits

Author SHA1 Message Date
bot
dc5237652e Merge pull request 'Update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.11.0' (#244) from renovate/org.jetbrains.kotlinx-kotlinx-serialization-json-1.x into main 2026-04-10 04:02:26 +02:00
Renovate Bot
f0bd4100dc Update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.11.0 2026-04-10 02:02:21 +00:00
9903790e87 Update .github/workflows/build.yml 2026-04-04 12:08:52 +02:00
06053b7ec8 Update .github/workflows/build.yml 2026-04-04 12:05:40 +02:00
bot
ab6073d415 Merge pull request 'Update dependency androidx.camera:camera-view to v1.6.0' (#243) from renovate/androidx.camera-camera-view-1.x into main 2026-03-28 03:02:44 +01:00
Renovate Bot
4f1897af2f Update dependency androidx.camera:camera-view to v1.6.0 2026-03-28 02:02:43 +00:00
bot
867e438857 Merge pull request 'Update dependency androidx.camera:camera-lifecycle to v1.6.0' (#242) from renovate/androidx.camera-camera-lifecycle-1.x into main 2026-03-28 03:02:36 +01:00
Renovate Bot
b41ff5868e Update dependency androidx.camera:camera-lifecycle to v1.6.0 2026-03-28 02:02:34 +00:00
bot
ca84a36630 Merge pull request 'Update dependency androidx.camera:camera-camera2 to v1.6.0' (#241) from renovate/androidx.camera-camera-camera2-1.x into main 2026-03-27 03:01:19 +01:00
bot
5736164692 Merge pull request 'Update dependency androidx.compose.ui:ui-tooling to v1.10.6' (#240) from renovate/androidx.compose.ui-ui-tooling-1.x into main 2026-03-27 03:01:18 +01:00
Renovate Bot
864927e8eb Update dependency androidx.camera:camera-camera2 to v1.6.0 2026-03-27 02:01:16 +00:00
Renovate Bot
8d4267608b Update dependency androidx.compose.ui:ui-tooling to v1.10.6 2026-03-27 02:01:14 +00:00
bot
7e41b10394 Merge pull request 'Update dependency androidx.compose.material:material to v1.10.6' (#239) from renovate/androidx.compose.material-material-1.x into main 2026-03-26 03:01:23 +01:00
bot
0f9bfa8f29 Merge pull request 'Update dependency androidx.compose:compose-bom to v2026.03.01' (#238) from renovate/androidx.compose-compose-bom-2026.x into main 2026-03-26 03:01:22 +01:00
Renovate Bot
2322a02e0d Update dependency androidx.compose.material:material to v1.10.6 2026-03-26 02:01:21 +00:00
Renovate Bot
b73cd5e9f7 Update dependency androidx.compose:compose-bom to v2026.03.01 2026-03-26 02:01:19 +00:00
bot
bcf848f667 Merge pull request 'Update dependency gradle to v9.4.1' (#237) from renovate/gradle-9.x into main 2026-03-20 03:02:34 +01:00
Renovate Bot
01a627af79 Update dependency gradle to v9.4.1 2026-03-20 02:02:31 +00:00
bot
e542c38eb9 Merge pull request 'Update plugin org.jetbrains.kotlin.plugin.serialization to v2.3.20' (#236) from renovate/org.jetbrains.kotlin.plugin.serialization-2.x into main 2026-03-18 03:09:11 +01:00
Renovate Bot
f1fdd91025 Update plugin org.jetbrains.kotlin.plugin.serialization to v2.3.20 2026-03-18 02:09:08 +00:00
bot
741c8eeb80 Merge pull request 'Update plugin org.jetbrains.kotlin.plugin.compose to v2.3.20' (#235) from renovate/org.jetbrains.kotlin.plugin.compose-2.x into main 2026-03-17 03:10:24 +01:00
bot
f3c5b80122 Merge pull request 'Update plugin org.jetbrains.kotlin.android to v2.3.20' (#234) from renovate/org.jetbrains.kotlin.android-2.x into main 2026-03-17 03:10:19 +01:00
Renovate Bot
dd03b7797f Update plugin org.jetbrains.kotlin.plugin.compose to v2.3.20 2026-03-17 02:10:18 +00:00
Renovate Bot
a705efbeb9 Update plugin org.jetbrains.kotlin.android to v2.3.20 2026-03-17 02:10:16 +00:00
bot
6865c0513f Merge pull request 'Update dependency androidx.compose:compose-bom to v2026.03.00' (#233) from renovate/androidx.compose-compose-bom-2026.x into main 2026-03-13 03:01:31 +01:00
bot
385484eb5c Merge pull request 'Update dependency androidx.datastore:datastore-preferences to v1.2.1' (#232) from renovate/androidx.datastore-datastore-preferences-1.x into main 2026-03-13 03:01:30 +01:00
Renovate Bot
8cc07d2570 Update dependency androidx.compose:compose-bom to v2026.03.00 2026-03-13 02:01:29 +00:00
Renovate Bot
e876d470ed Update dependency androidx.datastore:datastore-preferences to v1.2.1 2026-03-13 02:01:26 +00:00
bot
f2a8a9b179 Merge pull request 'Update dependency androidx.compose.ui:ui-tooling to v1.10.5' (#231) from renovate/androidx.compose.ui-ui-tooling-1.x into main 2026-03-12 03:01:41 +01:00
bot
a03e9553c3 Merge pull request 'Update dependency androidx.compose.material:material to v1.10.5' (#230) from renovate/androidx.compose.material-material-1.x into main 2026-03-12 03:01:38 +01:00
Renovate Bot
6f5fc5733e Update dependency androidx.compose.ui:ui-tooling to v1.10.5 2026-03-12 02:01:37 +00:00
Renovate Bot
0cff562c76 Update dependency androidx.compose.material:material to v1.10.5 2026-03-12 02:01:35 +00:00
bot
a9e5e0c969 Merge pull request 'Update dependency joda-time:joda-time to v2.14.1' (#229) from renovate/joda-time-joda-time-2.x into main 2026-03-09 03:01:38 +01:00
Renovate Bot
ee1ef7b2de Update dependency joda-time:joda-time to v2.14.1 2026-03-09 02:01:32 +00:00
bot
b22c24aa54 Merge pull request 'Update plugin com.android.library to v9.1.0' (#227) from renovate/com.android.library-9.x into main 2026-03-05 03:02:34 +01:00
bot
0ceee3ab67 Merge pull request 'Update dependency gradle to v9.4.0' (#228) from renovate/gradle-9.x into main 2026-03-05 03:02:30 +01:00
Renovate Bot
5c4b20d57c Update plugin com.android.library to v9.1.0 2026-03-05 02:02:30 +00:00
Renovate Bot
5c4b3c7df0 Update dependency gradle to v9.4.0 2026-03-05 02:02:28 +00:00
bot
933578fca0 Merge pull request 'Update plugin com.android.application to v9.1.0' (#226) from renovate/com.android.application-9.x into main 2026-03-04 03:01:52 +01:00
Renovate Bot
ec12827b21 Update plugin com.android.application to v9.1.0 2026-03-04 02:01:49 +00:00
bot
3655987082 Merge pull request 'Update dependency androidx.compose:compose-bom to v2026.02.01' (#225) from renovate/androidx.compose-compose-bom-2026.x into main 2026-02-28 03:02:30 +01:00
Renovate Bot
28ec153a0c Update dependency androidx.compose:compose-bom to v2026.02.01 2026-02-28 02:02:28 +00:00
bot
f3d7059221 Merge pull request 'Update plugin com.autonomousapps.dependency-analysis to v3.6.1' (#224) from renovate/com.autonomousapps.dependency-analysis-3.x into main 2026-02-27 03:01:51 +01:00
Renovate Bot
c83ef3d3c4 Update plugin com.autonomousapps.dependency-analysis to v3.6.1 2026-02-27 02:01:43 +00:00
bot
4dfb171d41 Merge pull request 'Update dependency androidx.compose.ui:ui-tooling to v1.10.4' (#223) from renovate/androidx.compose.ui-ui-tooling-1.x into main 2026-02-26 03:01:50 +01:00
bot
ee6a8dc35a Merge pull request 'Update dependency androidx.compose.material:material to v1.10.4' (#222) from renovate/androidx.compose.material-material-1.x into main 2026-02-26 03:01:47 +01:00
Renovate Bot
8e22babdc2 Update dependency androidx.compose.ui:ui-tooling to v1.10.4 2026-02-26 02:01:45 +00:00
Renovate Bot
a770f0d381 Update dependency androidx.compose.material:material to v1.10.4 2026-02-26 02:01:43 +00:00
bot
7976c05e76 Merge pull request 'Update plugin com.android.library to v9.0.1' (#221) from renovate/com.android.library-9.x into main 2026-02-14 03:03:02 +01:00
Renovate Bot
af8d718058 Update plugin com.android.library to v9.0.1 2026-02-14 02:03:01 +00:00
bot
ccf9da6e98 Merge pull request 'Update plugin com.android.application to v9.0.1' (#220) from renovate/com.android.application-9.x into main 2026-02-14 03:02:54 +01:00
Renovate Bot
6c27af1404 Update plugin com.android.application to v9.0.1 2026-02-14 02:02:52 +00:00
bot
daef958340 Merge pull request 'Update dependency androidx.compose:compose-bom to v2026.02.00' (#219) from renovate/androidx.compose-compose-bom-2026.x into main 2026-02-13 03:02:10 +01:00
Renovate Bot
1cea5b6c3f Update dependency androidx.compose:compose-bom to v2026.02.00 2026-02-13 02:02:07 +00:00
bot
4d52634e18 Merge pull request 'Update dependency androidx.compose.ui:ui-tooling to v1.10.3' (#218) from renovate/androidx.compose.ui-ui-tooling-1.x into main 2026-02-12 03:02:13 +01:00
bot
6f6d220f4f Merge pull request 'Update dependency androidx.compose.material:material to v1.10.3' (#217) from renovate/androidx.compose.material-material-1.x into main 2026-02-12 03:02:11 +01:00
Renovate Bot
34858d23d5 Update dependency androidx.compose.ui:ui-tooling to v1.10.3 2026-02-12 02:02:10 +00:00
Renovate Bot
8ddd042579 Update dependency androidx.compose.material:material to v1.10.3 2026-02-12 02:02:08 +00:00
bot
7136f8c883 Merge pull request 'Update plugin org.jetbrains.kotlin.plugin.serialization to v2.3.10' (#216) from renovate/org.jetbrains.kotlin.plugin.serialization-2.x into main 2026-02-07 03:10:06 +01:00
Renovate Bot
372274cfc3 Update plugin org.jetbrains.kotlin.plugin.serialization to v2.3.10 2026-02-07 02:10:04 +00:00
bot
54ff955670 Merge pull request 'Update plugin org.jetbrains.kotlin.plugin.compose to v2.3.10' (#215) from renovate/org.jetbrains.kotlin.plugin.compose-2.x into main 2026-02-06 03:09:47 +01:00
Renovate Bot
b43d1a53e2 Update plugin org.jetbrains.kotlin.plugin.compose to v2.3.10 2026-02-06 02:09:44 +00:00
4 changed files with 18 additions and 18 deletions

View File

@@ -33,8 +33,6 @@ jobs:
gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch keystore.asc > app/keystore.properties gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch keystore.asc > app/keystore.properties
gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch key.asc > app/key.jks gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch key.asc > app/key.jks
- uses: gradle/wrapper-validation-action@v3
- name: create and checkout branch - name: create and checkout branch
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'
env: env:
@@ -47,6 +45,8 @@ jobs:
java-version: 17 java-version: 17
distribution: "temurin" distribution: "temurin"
cache: 'gradle' cache: 'gradle'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v6
- name: Build APK - name: Build APK
run: ./gradlew assemble run: ./gradlew assemble

View File

@@ -1,8 +1,8 @@
plugins { plugins {
id 'com.android.application' id 'com.android.application'
id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.0' id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.20'
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.0' id 'org.jetbrains.kotlin.plugin.compose' version '2.3.20'
} }
@@ -93,36 +93,36 @@ android {
dependencies { dependencies {
implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.material3:material3:1.4.0' implementation 'androidx.compose.material3:material3:1.4.0'
implementation 'androidx.compose.material:material:1.10.2' implementation 'androidx.compose.material:material:1.10.6'
implementation 'androidx.compose.material:material-icons-extended:1.7.8' implementation 'androidx.compose.material:material-icons-extended:1.7.8'
implementation 'androidx.navigation:navigation-compose:2.9.7' implementation 'androidx.navigation:navigation-compose:2.9.7'
implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.preference:preference-ktx:1.2.1'
implementation "androidx.biometric:biometric:1.2.0-alpha05" implementation "androidx.biometric:biometric:1.2.0-alpha05"
implementation "androidx.security:security-crypto:1.1.0" implementation "androidx.security:security-crypto:1.1.0"
implementation "androidx.datastore:datastore-preferences:1.2.0" implementation "androidx.datastore:datastore-preferences:1.2.1"
implementation "androidx.security:security-crypto:1.1.0" implementation "androidx.security:security-crypto:1.1.0"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
implementation 'androidx.camera:camera-lifecycle:1.5.3' implementation 'androidx.camera:camera-lifecycle:1.6.0'
implementation 'androidx.camera:camera-view:1.5.3' implementation 'androidx.camera:camera-view:1.6.0'
runtimeOnly 'androidx.camera:camera-camera2:1.5.3' runtimeOnly 'androidx.camera:camera-camera2:1.6.0'
implementation 'com.google.android.material:material:1.13.0' implementation 'com.google.android.material:material:1.13.0'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0' implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0'
implementation 'com.google.zxing:core:3.5.4' implementation 'com.google.zxing:core:3.5.4'
implementation project(":database") implementation project(":database")
implementation project(":crypto") implementation project(":crypto")
implementation platform('androidx.compose:compose-bom:2026.01.01') implementation platform('androidx.compose:compose-bom:2026.03.01')
implementation 'androidx.compose.ui:ui-tooling:1.10.2' implementation 'androidx.compose.ui:ui-tooling:1.10.6'
implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.ui:ui-tooling-preview'
//Submodule //Submodule
//noinspection NewerVersionAvailable //noinspection NewerVersionAvailable
implementation 'joda-time:joda-time:2.14.0' implementation 'joda-time:joda-time:2.14.1'
implementation 'org.joda:joda-convert:3.0.1' implementation 'org.joda:joda-convert:3.0.1'
} }

View File

@@ -9,8 +9,8 @@ buildscript {
} }
plugins { plugins {
id 'com.android.application' version '9.0.0' apply false id 'com.android.application' version '9.1.0' apply false
id 'com.android.library' version '9.0.0' apply false id 'com.android.library' version '9.1.0' apply false
id 'org.jetbrains.kotlin.android' version '2.3.10' apply false id 'org.jetbrains.kotlin.android' version '2.3.20' apply false
id 'com.autonomousapps.dependency-analysis' version '3.5.1' apply true id 'com.autonomousapps.dependency-analysis' version '3.6.1' apply true
} }

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME