Compare commits
1 Commits
main
...
59b2988697
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
59b2988697 |
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@@ -23,7 +23,7 @@ jobs:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: set up secrets
|
||||
run: |
|
||||
@@ -32,6 +32,7 @@ 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'
|
||||
@@ -44,9 +45,7 @@ jobs:
|
||||
with:
|
||||
java-version: 17
|
||||
distribution: "temurin"
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v6
|
||||
cache: 'gradle'
|
||||
|
||||
- name: Build APK
|
||||
run: ./gradlew assembleSignedRelease
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
plugins {
|
||||
id 'com.android.application'
|
||||
id 'org.jetbrains.kotlin.android'
|
||||
id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.20'
|
||||
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.20'
|
||||
id 'com.mikepenz.aboutlibraries.plugin' version '13.2.1'
|
||||
id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.20'
|
||||
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.20'
|
||||
id 'com.mikepenz.aboutlibraries.plugin' version '12.2.4'
|
||||
}
|
||||
|
||||
|
||||
@@ -96,29 +96,29 @@ aboutLibraries {
|
||||
|
||||
dependencies {
|
||||
implementation 'androidx.compose.material3:material3:1.4.0'
|
||||
implementation "androidx.compose.material:material:1.10.6"
|
||||
implementation "androidx.compose.material:material:1.9.3"
|
||||
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.5'
|
||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
|
||||
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0'
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
|
||||
|
||||
implementation 'androidx.preference:preference-ktx:1.2.1'
|
||||
implementation 'androidx.compose.ui:ui'
|
||||
implementation "androidx.activity:activity-ktx:1.13.0"
|
||||
implementation "androidx.activity:activity-ktx:1.11.0"
|
||||
|
||||
implementation 'androidx.compose.ui:ui-tooling-preview'
|
||||
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.9.0'
|
||||
|
||||
implementation 'com.caverock:androidsvg-aar:1.4'
|
||||
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
|
||||
|
||||
implementation 'com.mikepenz:aboutlibraries:13.2.1'
|
||||
implementation 'com.mikepenz:aboutlibraries-compose-m3:13.2.1'
|
||||
implementation 'com.mikepenz:aboutlibraries-core:13.2.1'
|
||||
implementation 'com.mikepenz:aboutlibraries:13.0.0'
|
||||
implementation 'com.mikepenz:aboutlibraries-compose-m3:13.1.0'
|
||||
implementation 'com.mikepenz:aboutlibraries-core:13.0.0'
|
||||
|
||||
|
||||
implementation platform('androidx.compose:compose-bom:2026.03.01')
|
||||
debugImplementation 'androidx.compose.ui:ui-tooling:1.10.6'
|
||||
implementation platform('androidx.compose:compose-bom:2025.10.00')
|
||||
debugImplementation 'androidx.compose.ui:ui-tooling:1.9.3'
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
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.android.application' version '8.13.0' apply false
|
||||
id 'com.android.library' version '8.13.0' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '2.2.20' apply false
|
||||
}
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,7 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
2
gradlew
vendored
2
gradlew
vendored
@@ -57,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/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/.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"dependencies": {
|
||||
"@turf/area": "^7.0.0",
|
||||
"@turf/turf": "^7.0.0",
|
||||
"jsdom": "^29.0.0",
|
||||
"jsdom": "^27.0.0",
|
||||
"mapshaper": "^0.6.79"
|
||||
},
|
||||
"type": "module"
|
||||
|
||||
Reference in New Issue
Block a user