7 Commits

4 changed files with 44 additions and 42 deletions

View File

@ -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.0.21' id 'org.jetbrains.kotlin.plugin.serialization' version '2.1.0'
id 'com.mikepenz.aboutlibraries.plugin' version '11.2.3' id 'com.mikepenz.aboutlibraries.plugin' version '11.2.3'
} }

View File

@ -2,5 +2,5 @@
plugins { plugins {
id 'com.android.application' version '8.7.2' apply false id 'com.android.application' version '8.7.2' apply false
id 'com.android.library' version '8.7.2' apply false id 'com.android.library' version '8.7.2' apply false
id 'org.jetbrains.kotlin.android' version '2.0.21' apply false id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
} }

View File

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

View File

@ -1509,11 +1509,11 @@
integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg== integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
"@types/node@*": "@types/node@*":
version "22.9.0" version "22.10.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.1.tgz#41ffeee127b8975a05f8c4f83fb89bcb2987d766"
integrity sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ== integrity sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==
dependencies: dependencies:
undici-types "~6.19.8" undici-types "~6.20.0"
"@types/node@^10.0.3": "@types/node@^10.0.3":
version "10.17.60" version "10.17.60"
@ -1822,7 +1822,7 @@ geokdbush@^1.1.0:
dependencies: dependencies:
tinyqueue "^1.2.2" tinyqueue "^1.2.2"
get-intrinsic@^1.1.3, get-intrinsic@^1.2.4: get-intrinsic@^1.2.4:
version "1.2.4" version "1.2.4"
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
@ -1839,11 +1839,11 @@ get-port@^3.1.0:
integrity sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg== integrity sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==
gopd@^1.0.1: gopd@^1.0.1:
version "1.0.1" version "1.1.0"
resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.1.0.tgz#df8f0839c2d48caefc32a025a49294d39606c912"
integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== integrity sha512-FQoVQnqcdk4hVM4JN1eromaun4iuS34oStkdlLENLdpULsuQcTyXj8w7ayhuUfPwEYZ1ZOooOTT6fdA9Vmx/RA==
dependencies: dependencies:
get-intrinsic "^1.1.3" get-intrinsic "^1.2.4"
has-property-descriptors@^1.0.2: has-property-descriptors@^1.0.2:
version "1.0.2" version "1.0.2"
@ -1988,9 +1988,9 @@ keygrip@~1.1.0:
tsscmp "1.0.6" tsscmp "1.0.6"
mapshaper@^0.6.79: mapshaper@^0.6.79:
version "0.6.101" version "0.6.102"
resolved "https://registry.yarnpkg.com/mapshaper/-/mapshaper-0.6.101.tgz#33f884ddfeb5dce2b453b5620fd95519d6175554" resolved "https://registry.yarnpkg.com/mapshaper/-/mapshaper-0.6.102.tgz#ca5108611ba07c46c788fbfbcf49fdf467f9fc33"
integrity sha512-HAeJfrYNO71Wz399LWV2rB6DIJdf4QMyP4CwqrtgOUnzsmZOgkameyvN2jGL9uakm3tgLo2mh8WflF7qBBg5Sg== integrity sha512-LYflAzywcFskJ4aQVdctuymmOzB15MEjRY2nU+tkEH2hXNtsNSsM/IhOTF+NuoQziKxx7tHZObxnQSpcH5yaAA==
dependencies: dependencies:
"@placemarkio/tokml" "^0.3.3" "@placemarkio/tokml" "^0.3.3"
"@tmcw/togeojson" "^5.6.0" "@tmcw/togeojson" "^5.6.0"
@ -2008,7 +2008,7 @@ mapshaper@^0.6.79:
iconv-lite "^0.6.3" iconv-lite "^0.6.3"
idb-keyval "^6.2.0" idb-keyval "^6.2.0"
kdbush "^3.0.0" kdbush "^3.0.0"
mproj "0.0.39" mproj "0.0.40"
msgpackr "^1.10.1" msgpackr "^1.10.1"
opn "^5.3.0" opn "^5.3.0"
rw "~1.3.3" rw "~1.3.3"
@ -2032,10 +2032,10 @@ mime-types@^2.1.12:
dependencies: dependencies:
mime-db "1.52.0" mime-db "1.52.0"
mproj@0.0.39: mproj@0.0.40:
version "0.0.39" version "0.0.40"
resolved "https://registry.yarnpkg.com/mproj/-/mproj-0.0.39.tgz#4f3dd7cfc492f8eb7bdfdbf327ea3ee14971fb7b" resolved "https://registry.yarnpkg.com/mproj/-/mproj-0.0.40.tgz#87b939304f432998becc099608d703777f8eedbc"
integrity sha512-E0U/vCIbP2F+a6lhDkPEJzrGkUVir3fcwXcsbXngoo8ZeNN2l8zpphXPZgbe6WvBQ/L4wI+DGdUmHK2zi8RvzQ== integrity sha512-Fda92o5LkFUr0Tbz/5QsVhsIgbhnrnQf/eLkYRWGfKspbgvjA0VCk1FF5bT1TgpMHAP7000alBRkV7Q7hesnQg==
dependencies: dependencies:
geographiclib "1.48.0" geographiclib "1.48.0"
rw "~1.3.2" rw "~1.3.2"
@ -2074,9 +2074,9 @@ node-gyp-build-optional-packages@5.2.2:
detect-libc "^2.0.1" detect-libc "^2.0.1"
nwsapi@^2.2.12: nwsapi@^2.2.12:
version "2.2.13" version "2.2.16"
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.13.tgz#e56b4e98960e7a040e5474536587e599c4ff4655" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.16.tgz#177760bba02c351df1d2644e220c31dfec8cdb43"
integrity sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ== integrity sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==
object-inspect@^1.13.1: object-inspect@^1.13.1:
version "1.13.3" version "1.13.3"
@ -2103,9 +2103,11 @@ parse5@^7.1.2:
entities "^4.5.0" entities "^4.5.0"
point-in-polygon-hao@^1.1.0: point-in-polygon-hao@^1.1.0:
version "1.1.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/point-in-polygon-hao/-/point-in-polygon-hao-1.1.0.tgz#37f5f4fbe14e89fa8a3bb7f67c9158079d2ede7c" resolved "https://registry.yarnpkg.com/point-in-polygon-hao/-/point-in-polygon-hao-1.2.0.tgz#d3aee090051c9766bea1ad853a60062a244616c7"
integrity sha512-3hTIM2j/v9Lio+wOyur3kckD4NxruZhpowUbEgmyikW+a2Kppjtu1eN+AhnMQtoHW46zld88JiYWv6fxpsDrTQ== integrity sha512-CZ7lsIwBeaWmsCUNY/zFiUFKdSg/X8ngMOhiTGW78iUB8frZm44TiDlLFN1xqJ0GI22hSJg2/SpzS+t/qrGvug==
dependencies:
robust-predicates "^3.0.2"
point-in-polygon@^1.1.0: point-in-polygon@^1.1.0:
version "1.1.0" version "1.1.0"
@ -2138,9 +2140,9 @@ punycode@^2.3.1:
integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
qs@^6.4.0: qs@^6.4.0:
version "6.13.0" version "6.13.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e"
integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==
dependencies: dependencies:
side-channel "^1.0.6" side-channel "^1.0.6"
@ -2317,17 +2319,17 @@ tinyqueue@^2.0.0, tinyqueue@^2.0.3:
resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08" resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08"
integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA== integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==
tldts-core@^6.1.59: tldts-core@^6.1.65:
version "6.1.59" version "6.1.65"
resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.59.tgz#95d1076ed9ea36f81493be515ad9d3e916440126" resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.65.tgz#4b238e9658469f82a61787ee9135a3f083de68fa"
integrity sha512-EiYgNf275AQyVORl8HQYYe7rTVnmLb4hkWK7wAk/12Ksy5EiHpmUmTICa4GojookBPC8qkLMBKKwCmzNA47ZPQ== integrity sha512-Uq5t0N0Oj4nQSbU8wFN1YYENvMthvwU13MQrMJRspYCGLSAZjAfoBOJki5IQpnBM/WFskxxC/gIOTwaedmHaSg==
tldts@^6.1.32: tldts@^6.1.32:
version "6.1.59" version "6.1.65"
resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.59.tgz#aa903f542a69429bcdf4bcd63f4f1fb4cf689312" resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.65.tgz#a3b8ad62292c7465d79addba3ff4bdc5fa92e4f5"
integrity sha512-472ilPxsRuqBBpn+KuRBHJvZhk6tTo4yTVsmODrLBNLwRYJPkDfMEHivgNwp5iEl+cbrZzzRtLKRxZs7+QKkRg== integrity sha512-xU9gLTfAGsADQ2PcWee6Hg8RFAv0DnjMGVJmDnUmI8a9+nYmapMQix4afwrdaCtT+AqP4MaxEzu7cCrYmBPbzQ==
dependencies: dependencies:
tldts-core "^6.1.59" tldts-core "^6.1.65"
topojson-client@3.x: topojson-client@3.x:
version "3.1.0" version "3.1.0"
@ -2372,10 +2374,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
undici-types@~6.19.8: undici-types@~6.20.0:
version "6.19.8" version "6.20.0"
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
util-deprecate@~1.0.1: util-deprecate@~1.0.1:
version "1.0.2" version "1.0.2"