Compare commits

..

No commits in common. "main" and "1.0c" have entirely different histories.
main ... 1.0c

6 changed files with 1257 additions and 1351 deletions

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.1.10' id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.21'
id 'com.mikepenz.aboutlibraries.plugin' version '11.5.0' id 'com.mikepenz.aboutlibraries.plugin' version '11.2.3'
} }
@ -82,12 +82,12 @@ aboutLibraries {
} }
dependencies { dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.4' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.3'
implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'com.google.android.material:material:1.12.0' implementation 'com.google.android.material:material:1.12.0'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0' implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3'
implementation 'com.caverock:androidsvg-aar:1.4' implementation 'com.caverock:androidsvg-aar:1.4'
implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation 'com.github.chrisbanes:PhotoView:2.3.0'
implementation 'com.mikepenz:aboutlibraries:11.5.0' implementation 'com.mikepenz:aboutlibraries:11.2.3'
} }

View File

@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id 'com.android.application' version '8.8.0' apply false id 'com.android.application' version '8.7.2' apply false
id 'com.android.library' version '8.8.0' apply false id 'com.android.library' version '8.7.2' apply false
id 'org.jetbrains.kotlin.android' version '2.1.10' apply false id 'org.jetbrains.kotlin.android' version '2.0.21' apply false
} }

View File

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
gradlew vendored
View File

@ -86,7 +86,8 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

View File

@ -2,7 +2,7 @@
"dependencies": { "dependencies": {
"@turf/area": "^7.0.0", "@turf/area": "^7.0.0",
"@turf/turf": "^7.0.0", "@turf/turf": "^7.0.0",
"jsdom": "^26.0.0", "jsdom": "^25.0.0",
"mapshaper": "^0.6.79" "mapshaper": "^0.6.79"
}, },
"type": "module" "type": "module"

2583
yarn.lock

File diff suppressed because it is too large Load Diff