Compare commits
22 Commits
741c8eeb80
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 541c79db7f | |||
|
|
7cad346bb7 | ||
| dc5237652e | |||
|
|
f0bd4100dc | ||
| 9903790e87 | |||
| 06053b7ec8 | |||
| ab6073d415 | |||
|
|
4f1897af2f | ||
| 867e438857 | |||
|
|
b41ff5868e | ||
| ca84a36630 | |||
| 5736164692 | |||
|
|
864927e8eb | ||
|
|
8d4267608b | ||
| 7e41b10394 | |||
| 0f9bfa8f29 | |||
|
|
2322a02e0d | ||
|
|
b73cd5e9f7 | ||
| bcf848f667 | |||
|
|
01a627af79 | ||
| e542c38eb9 | |||
|
|
f1fdd91025 |
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 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
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
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.10'
|
id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.20'
|
||||||
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.20'
|
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.20'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,7 +93,7 @@ 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.5'
|
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'
|
||||||
@@ -105,19 +105,19 @@ dependencies {
|
|||||||
|
|
||||||
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.03.00')
|
implementation platform('androidx.compose:compose-bom:2026.03.01')
|
||||||
implementation 'androidx.compose.ui:ui-tooling:1.10.5'
|
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
|
||||||
|
|||||||
@@ -12,5 +12,5 @@ plugins {
|
|||||||
id 'com.android.application' version '9.1.0' apply false
|
id 'com.android.application' version '9.1.0' apply false
|
||||||
id 'com.android.library' 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 'org.jetbrains.kotlin.android' version '2.3.20' apply false
|
||||||
id 'com.autonomousapps.dependency-analysis' version '3.6.1' apply true
|
id 'com.autonomousapps.dependency-analysis' version '3.7.0' apply true
|
||||||
}
|
}
|
||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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.4.0-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
|
||||||
|
|||||||
Reference in New Issue
Block a user