4 Commits

Author SHA1 Message Date
ae2cde3545 Update app/build.gradle 2026-05-23 14:06:23 +02:00
soraefir
1000319b8f Bump java version workflow to 21 2026-05-23 11:45:32 +02:00
soraefir
8c4c5e16e0 Fix build error with backuprules 2026-05-23 11:42:03 +02:00
soraefir
0ce1e604a8 Update node deps 2026-05-23 11:39:04 +02:00
5 changed files with 4590 additions and 3477 deletions

View File

@@ -42,7 +42,7 @@ jobs:
- name: set up JDK - name: set up JDK
uses: actions/setup-java@v5 uses: actions/setup-java@v5
with: with:
java-version: 17 java-version: 21
distribution: "temurin" distribution: "temurin"
- name: Setup Gradle - name: Setup Gradle

View File

@@ -1,3 +1,16 @@
def getCommitCount() {
try {
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-list', '--count', 'HEAD'
standardOutput = stdout
}
return stdout.toString().trim().toInteger()
} catch (ignored) {
return 1
}
}
plugins { plugins {
id 'com.android.application' id 'com.android.application'
id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.21' id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.21'
@@ -15,8 +28,8 @@ android {
applicationId 'net.helcel.beans' applicationId 'net.helcel.beans'
minSdk = 28 minSdk = 28
targetSdk = 37 targetSdk = 37
versionCode 4 versionName "1.2"
versionName "1.1a" versionCode getCommitCount()
} }
signingConfigs { signingConfigs {
register("release") { register("release") {

View File

@@ -8,8 +8,7 @@
android:hardwareAccelerated="false" android:hardwareAccelerated="false"
android:icon="@mipmap/ic_launcher_round" android:icon="@mipmap/ic_launcher_round"
android:label="${APP_NAME}" android:label="${APP_NAME}"
android:supportsRtl="true" android:supportsRtl="true">
tools:replace="android:allowBackup">
<activity <activity
android:name=".activity.MainScreen" android:name=".activity.MainScreen"
android:exported="true"> android:exported="true">

View File

@@ -1,9 +1,9 @@
{ {
"dependencies": { "dependencies": {
"@turf/area": "^7.0.0", "@turf/area": "^7.3.5",
"@turf/turf": "^7.0.0", "@turf/turf": "^7.3.5",
"jsdom": "^29.0.0", "jsdom": "^29.1.1",
"mapshaper": "^0.7.0" "mapshaper": "^0.7.19"
}, },
"type": "module" "type": "module"
} }

8037
yarn.lock

File diff suppressed because it is too large Load Diff