Compare commits
64 Commits
3a5a9ca273
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 9903790e87 | |||
| 06053b7ec8 | |||
| ab6073d415 | |||
|
4f1897af2f | ||
| 867e438857 | |||
|
|
b41ff5868e | ||
| ca84a36630 | |||
| 5736164692 | |||
|
|
864927e8eb | ||
|
|
8d4267608b | ||
| 7e41b10394 | |||
| 0f9bfa8f29 | |||
|
|
2322a02e0d | ||
|
|
b73cd5e9f7 | ||
| bcf848f667 | |||
|
|
01a627af79 | ||
| e542c38eb9 | |||
|
|
f1fdd91025 | ||
| 741c8eeb80 | |||
| f3c5b80122 | |||
|
|
dd03b7797f | ||
|
|
a705efbeb9 | ||
| 6865c0513f | |||
| 385484eb5c | |||
|
|
8cc07d2570 | ||
|
|
e876d470ed | ||
| f2a8a9b179 | |||
| a03e9553c3 | |||
|
|
6f5fc5733e | ||
|
|
0cff562c76 | ||
| a9e5e0c969 | |||
|
|
ee1ef7b2de | ||
| b22c24aa54 | |||
| 0ceee3ab67 | |||
|
|
5c4b20d57c | ||
|
|
5c4b3c7df0 | ||
| 933578fca0 | |||
|
|
ec12827b21 | ||
| 3655987082 | |||
|
|
28ec153a0c | ||
| f3d7059221 | |||
|
|
c83ef3d3c4 | ||
| 4dfb171d41 | |||
| ee6a8dc35a | |||
|
|
8e22babdc2 | ||
|
|
a770f0d381 | ||
| 7976c05e76 | |||
|
|
af8d718058 | ||
| ccf9da6e98 | |||
|
|
6c27af1404 | ||
| daef958340 | |||
|
|
1cea5b6c3f | ||
| 4d52634e18 | |||
| 6f6d220f4f | |||
|
|
34858d23d5 | ||
|
|
8ddd042579 | ||
| 7136f8c883 | |||
|
|
372274cfc3 | ||
| 54ff955670 | |||
| f4f18258d1 | |||
|
|
b43d1a53e2 | ||
|
|
63c1bd1d7e | ||
| 4e33f88f4f | |||
|
|
9893c8ddae |
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@@ -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 key.asc > app/key.jks
|
||||
|
||||
- uses: gradle/wrapper-validation-action@v3
|
||||
|
||||
- name: create and checkout branch
|
||||
if: github.event_name == 'pull_request'
|
||||
env:
|
||||
@@ -47,6 +45,8 @@ jobs:
|
||||
java-version: 17
|
||||
distribution: "temurin"
|
||||
cache: 'gradle'
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v6
|
||||
|
||||
- name: Build APK
|
||||
run: ./gradlew assemble
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
plugins {
|
||||
id 'com.android.application'
|
||||
id 'org.jetbrains.kotlin.android'
|
||||
id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.0'
|
||||
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.0'
|
||||
id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.20'
|
||||
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.20'
|
||||
}
|
||||
|
||||
|
||||
@@ -93,21 +93,21 @@ android {
|
||||
dependencies {
|
||||
implementation 'androidx.compose.ui:ui'
|
||||
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.navigation:navigation-compose:2.9.7'
|
||||
implementation 'androidx.preference:preference-ktx:1.2.1'
|
||||
|
||||
implementation "androidx.biometric:biometric:1.2.0-alpha05"
|
||||
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"
|
||||
|
||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
|
||||
|
||||
implementation 'androidx.camera:camera-lifecycle:1.5.3'
|
||||
implementation 'androidx.camera:camera-view:1.5.3'
|
||||
runtimeOnly 'androidx.camera:camera-camera2:1.5.3'
|
||||
implementation 'androidx.camera:camera-lifecycle:1.6.0'
|
||||
implementation 'androidx.camera:camera-view:1.6.0'
|
||||
runtimeOnly 'androidx.camera:camera-camera2:1.6.0'
|
||||
|
||||
implementation 'com.google.android.material:material:1.13.0'
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0'
|
||||
@@ -116,13 +116,13 @@ dependencies {
|
||||
implementation project(":database")
|
||||
implementation project(":crypto")
|
||||
|
||||
implementation platform('androidx.compose:compose-bom:2026.01.01')
|
||||
implementation 'androidx.compose.ui:ui-tooling:1.10.2'
|
||||
implementation platform('androidx.compose:compose-bom:2026.03.01')
|
||||
implementation 'androidx.compose.ui:ui-tooling:1.10.6'
|
||||
implementation 'androidx.compose.ui:ui-tooling-preview'
|
||||
|
||||
//Submodule
|
||||
//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'
|
||||
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@ buildscript {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.android.application' version '9.0.0' apply false
|
||||
id 'com.android.library' version '9.0.0' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '2.3.0' apply false
|
||||
id 'com.autonomousapps.dependency-analysis' version '3.5.1' apply true
|
||||
id 'com.android.application' version '9.1.0' apply false
|
||||
id 'com.android.library' version '9.1.0' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '2.3.20' apply false
|
||||
id 'com.autonomousapps.dependency-analysis' version '3.6.1' apply true
|
||||
}
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
Reference in New Issue
Block a user