From 239e1cb3dcb187fbc688c60661632d67f68c6019 Mon Sep 17 00:00:00 2001 From: Alexey Illarionov Date: Wed, 15 Jan 2025 09:45:58 +0300 Subject: [PATCH] Bumpd dependency versions * Android Gradle Plugin 8.7.3 * atomicfu 0.27.0 * Dokka 2.0.0 * Okio 3.10.2 * orgjson 20250107 * Spotless 7.0.0 * Wire 5.2.1 --- gradle.properties | 3 - gradle/libs.versions.toml | 16 +-- gradle/verification-keyring.keys | 118 +++--------------- gradle/verification-metadata.xml | 50 ++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +- .../parser/IgdbDumpResponseParser.jvm.kt | 2 +- .../parser/IgdbErrorResponseParser.jvm.kt | 3 +- .../parser/IgdbWebhookListJsonParser.jvm.kt | 3 +- .../kotlin/internal/parser/JsonTokenerExt.kt | 16 +++ .../TwitchTokenErrorResponseParser.jvm.kt | 3 +- .../internal/parser/TwitchTokenParser.jvm.kt | 3 +- .../BaseIgdbDumpApiImplementationTest.kt | 2 +- kotlin-js-store/yarn.lock | 110 +++++----------- 14 files changed, 131 insertions(+), 203 deletions(-) create mode 100644 igdbclient-core/src/jvmMain/kotlin/internal/parser/JsonTokenerExt.kt diff --git a/gradle.properties b/gradle.properties index 03752ea..706ffaf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,6 +25,3 @@ kotlin.mpp.import.enableKgpDependencyResolution=true #AtomicFu kotlinx.atomicfu.enableJvmIrTransformation=true kotlinx.atomicfu.enableJsIrTransformation=true - -# https://github.com/Kotlin/dokka/issues/3153 -org.jetbrains.dokka.classpath.useNativeDistributionAccessor=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94c3de4..aa99535 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,12 +2,12 @@ androidMinSdk = "14" androidCompileSdk = "33" -agp = "8.5.2" +agp = "8.7.3" assertk = "0.28.1" -atomicfu = '0.26.1' +atomicfu = '0.27.0' detekt = "1.23.7" diktat = "2.0.0" -dokka = "1.9.20" +dokka = "2.0.0" junit5 = "5.11.4" junit-platform-launcher = "1.11.4" gradle-maven-publish-plugin = "0.30.0" @@ -18,16 +18,16 @@ kotlin-compile-testing-fork = "0.7.0" kotlinpoet = "2.0.0" kotlinx-binary-compatibility-validator = "0.17.0" kotlinx-coroutines = "1.10.1" -kotlinx-serialization = "1.7.3" +kotlinx-serialization = "1.8.0" ktor = "3.0.3" okhttp3 = "4.12.0" okhttp5 = "5.0.0-alpha.14" -okio = "3.9.1" -orgjson = "20240303" +okio = "3.10.2" +orgjson = "20250107" slf4j = "2.0.16" -spotless = "7.0.0.BETA4" +spotless = "7.0.0" turbine = "1.2.0" -wire = "5.1.0" +wire = "5.2.1" [libraries] assertk = { group = "com.willowtreeapps.assertk", name = "assertk", version.ref = "assertk" } diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 5314709..287f34b 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -1,7 +1,6 @@ pub 80C08B1C29100955 sub CF771F914C2A4A73 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBE2fCWARBAC3v9wYo5kmynmVP+43ccamidflSLQjjpsXpSDLPFokGxeuw0OC QJy46m8b5ACoCqRlfwnRRcEHxiSlaBATJA6hi7NRO41R39C62JXsIxNJR16JNQ5k @@ -32,7 +31,6 @@ pub 84E913A8E3A748C0 uid The Legion of the Bouncy Castle Inc. (Maven Repository Artifact Signer) -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGR/8HUBDADJ+V5VgTXFG4xVI/1r07a/pTXoAQhHyJMkVdFScGARsps07VXI IsYgPsifOFU55E7uRMZPTLAx5F1uxoZAWGtXIz0d4ISKhobFquH8jZe7TnsJBJNV @@ -53,7 +51,6 @@ uid Marc Philipp sub 8B2A34A7D4A9B8B3 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFrKW9IBEACkqUvM7hU1WqOOeb1gZ7pUsRliHuoUvYIrd+hdp+qhPmJ0NG0W YhZK5UtJBmqvtHKRkbwYxUuya9zlBmCfQFf0GpFKJ65JSrPSkZADI3aZ4aUkxIUw @@ -96,7 +93,6 @@ PXCe8La72ukmaxEGbpJ8mdzS2PJko7mm pub 8671A8DF71296252 sub 51F5B36C761AA122 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFoQh54BEADOuivAfgGKc4/zDwx+AwJdctjTT0znL9knRTYG6ediv2Eq+CXm gBM9m5twl+qhUB1NtrdHb4BH49VY9/gHr3JDyo5ewu96qkbeQl4pxW0zmHg/yJx7 @@ -140,7 +136,6 @@ uid Gary David Gregory (Code signing key) sub 59BA7BFEAD3D7F94 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk @@ -170,7 +165,6 @@ uid Olivier Lamy sub 1AFEC329B615D06C -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEdddbQRBADRgstdUZq7ceq3NYcR5kpoU2tN2Zvg1vptE9FxpDbL73gdLWnI C7IAx+NNjdG7Ncdg+u10UZv6OSmhWAd8ubWcD9JxKtS4UXkNPHxhHFHqVPHuCwsQ @@ -203,7 +197,6 @@ uid Gradle Inc. sub 5E9AEEBA28836032 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGUVRogBEAChVh0t3YAJIdreb6SP/lf4x097IRpOiJ7Ww+DDtXFUhKJBwgfC 4T10TBGP835tV6TfkEeCPGWABoxaD88zUlSHs7k7v/SfedwfOKbOE3c+oR43JL7P @@ -248,7 +241,6 @@ uid Tatu Saloranta sub E98008460EB9BB34 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBF8kuOUBCACo8/VYVfmglgTgmai5FvmNzKi9XIJIK4fHCA1r+t47aGkGy36E dSOlApDjqbtuodnyH4jiyBvT599yeMA0O/Pr+zL+dOwdT1kYL/owvT0U9oczvwUj @@ -275,7 +267,6 @@ KfGcgIYM2uIHlATC0ILt7gGcAWmEj7bXEzy9Jqg9YirnHcrlYF0r pub 995EFBF4A3D20BEB sub B89991D171A02F5C -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBF9amNkBEADKyJj5snYd8bZpONpu1QHf7c/TK9HxcMzGZaIv9QzViX6CtEHb 2Q2x6ejXQ2frECMrvns5JAJd21B6215EhlOqrHSMkTrQ6fvOIfWd0huZ0QHr4FME @@ -317,7 +308,6 @@ bD6Qc/aECwy4BBgcKw3t/PVHKOE7RUjO/QWG6CIej/nl7O0g91NtlEY= pub 9A259C7EE636C5ED sub D66472CF54179CC4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFKD+PgBEAC8IkWujQlmU0/7+QPZFsc/z/rXgg7BQyo330QK4HeMzeCK6WHa SWzVDM9h6nFDs6Xln6YexbZUjLsxS/a/Ox2i26Qg8B+NghgiratbdJsByRrU/3la @@ -361,7 +351,6 @@ uid Slawomir Jaranowski sub E3F6790A5A167F5A -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGHDIagBEADpzdCwVjVlHuo8qpu9HtmqNpEW4TB7y6+NX7Q39mj8w+iVskE1 sL0+BOCdP6ZMiQziWbOQ2FxCd3mD0ixZ7v1i7+0jowySPacJbVNaPPECP38gDte4 @@ -406,7 +395,6 @@ uid DiffPlug LLC sub 030DD9087C31C9AF -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGPAYVUBDADCs9PkY8zzhzE38bRZX+vTrr3LdChGNBmObV858NGRrXeZtyLu U7YwYVF7w2vHUI/JQWrlPZc5tBFicefucfUtKt790WzAk3NBjGtX4IWpG57C1Z5t @@ -441,7 +429,6 @@ Q/IKL5Iy5doINK/iyjb/G/JLH1/TkhW9zEheiKUY6TiXeR3p pub A2115AE15F6B8B72 sub 6366592024774157 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBDsSIk4RBADSCj6rUjV64tYCGT1DYKYR7GthyWpNdGHSYLbETBcDatAe1dzQ 5NsCgfrlybfyeY+y1lxr3T9bqf6zJWDw/718wff96qmmv1qzexSYtmIrj+h53V82 @@ -466,7 +453,6 @@ KrnduWWXAJ9Adm9Mz4yoxrosHSkp5BWzXBUt4A== pub A41F13C999945293 sub 8183E80D264EE073 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBE8YNGIBEADEgcfvs8TL3X2Ql62HJ6SrXWAOoHw5CquJxUQkvBGesIT1Hk24 exiPwrlNE1qUjbVlef1Cwk9ZfwMOpJdfP2MQQbx0nxxqv+JtsoeXUy9bTSvZYBUL @@ -508,7 +494,6 @@ WD8lsvbx6avD2hwf9dvyqWO2sHjbmWE+Rn8VpJgXWVvXdM0hFPWrUzI= pub A6ADFC93EF34893E sub 9C4C23E6FFE405BD -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE+xZxIBCACzKctn4ez8xOC0pGThhAwjYWGkzcwK4HNaC1usHThBFz3/t8JN OqUXRixLyi5wELN6GHlsGVUQS3IfB4JtuhScsieSB8PTree68/knMq6JI08mJqZr @@ -533,7 +518,6 @@ EEIhZlI/ojefaZkRseFrtl3X pub A6EA2E2BF22E0543 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6 xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ @@ -550,7 +534,6 @@ C3s8XOaBCbJbKpMAEQEAAQ== pub B0F3710FA64900E7 sub 7892707E9657EBD4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFdbSfIBCACrFI0ai/abnV2U2Wa9QQZwGk3Fegc8laiuTKc0GoYdyptd83/H hD5S61ppdkOugBjVTHdgda3xJ7zBZdnwjZvV/TyayQltbh6hU+BMlEolzXLgyvY7 @@ -576,7 +559,6 @@ Nnwr++TI1CGYthPLFHFc831L pub B16698A4ADF4D638 sub 32784D4F004B405B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFM1v9ABCADD0KoXq2ZKlUHeIVovQy3gFmW9oFAaraV48ouv8cYvqdf+s91H NyqeyNPT/ihFeNqZJUAMyPdwN5xrWD6gxMrOCR7BFhA5kLmAKz4HfFCQ05ViyQdI @@ -602,7 +584,6 @@ G+N4TWQ9euj8Rd4hjsYPOwDfgVIUGIhpTUJ+fz046fkz9MWnX7RJh6hqLAXT7Hbc pub B341DDB020FCB6AB sub 315693699F8D102F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEowbDsRBAD2jx/Q2jNuCkgiS3fzIj6EzDP+2kipIKH2LEnpnTiBlds2PFYM xYibVab/grgQODxTdDnAKifbJA/4h1/T7ba+OV+xIUoSI5MbgaF3USidiDHPX0pY @@ -632,7 +613,6 @@ JI97g3GZQ2CHkQwJ3+WcPw== pub B6D3AB9BCC641282 sub 700E4F39BC05364B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFhaXO0BEAC8WCdwrJNF/W+C8m9FYwAhEvKBvQ7xmoGYZqgcYe2ntT8udvgZ k+dRwZJnu1VI3a8feOLrAmeNI2MxPP0+l2kGeC55c10duXPzLvW9oHONm39FZpCM @@ -709,7 +689,6 @@ r9ms8KlsMRaTfN7RD2yuEsFj4JNZ0hC12WeQpXA4KmrYPv57+6K8UQEGfrAUHS5/ pub BCF4173966770193 sub C9F04E6E2DC4F7F8 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFKneXIBCACtnX3ZQmPujf6ocvdnhsBheze71DSl34TfebyW2Qt+g9NhMxo4 DaJy+iFNnsaMwLZRr6k/qf+ISE3A4opWAQlbk+Wb5s6DPPA2cHH6W4GdkxtuJzqt @@ -737,7 +716,6 @@ uid Egor Andreevici sub 84761D363E7B0FC4 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBF7rgogBCADU9OwoEFdIgN5U0JU5pI7s3T1T1LeDMzAQ8l2Hq4jFrhnrjcEA ieDSut1YIv5NTBoZv4CrklaKvvQNUXPvKrFImA4OKhBodKV3wsq2efCATDGa1JAw @@ -764,7 +742,6 @@ eQh3BspmZac4oUdxAqzyU5N/Um+w90sQluFqwoVd5FX5i4L3 pub C1B12A5D99C0729D sub 606CC6C4533E81A2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGAic/4BDACtIv4a32pL+84jJNhJ1yb6GFgoWknJSJ6IELIL0Z7m+FYsymRs lTJ/QwBgjZlgS3HS7IBhEl5o+kEt2/U5lPkz/krP8By8EvRv18PpfBzmXNT8rGqc @@ -798,7 +775,6 @@ S/lTVpQO+b//JnTWDaGUkhM6IdLK+pJDxQwFRJBJfDHZj4y10zQANp5u2nyyg8Q= pub C727D053C4481CF5 sub 29E792953D515FC5 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF8pVB0BDADcwRGpJUDe8eVSlJ0yPQl/CyeYc0RWq2f1seUMQO0xFW1xPIeL IE68D9VdgarA88qDLYesfBqzn57/r/ztj2aLEKt8IRunJzd0w0G2rrgSCZQ8RmzL @@ -832,7 +808,6 @@ cR19NEV8Rfs96NyYYUvfC+ro4to0pXe2n4X3BixeaBmNdHWd9YYgXjYxnM4pLyU= pub C9FBAA83A8753994 sub AFF3E378166B1F0F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFeWvEwBCAC7oSQ7XqcGDc6YL4KAGvDVZYigcJmv0y5hWT4wv9ABP4Jhzr1H NDmmGyWzhzTeMxwuZnc9vhxCQRwyxj3gGI5lYPEARswbi2fWk//78/3Wk+YMHJw3 @@ -860,7 +835,6 @@ uid Sebastiano Vigna sub 17755EEA52A858CE -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF+oUkoBDADeE9IXjwvW9HlfIYhQfTlJ29cReMfOM0UW3dAn3XJduUcnYKoc 3dKGCcsanzIELL6QuapXYAlq2WWlP1oC2IEbYyilKs/ocv2gc6/GQFKBAEqHKVXH @@ -897,7 +871,6 @@ uid Eclipse Implementation of JAXB Project sub 7ECBD740FF06AEB5 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFuX5CkBEADkTgn4nzuq0lWR+7kFGYLKvmPLjes4j2nmygIafUjVbNmD70gY DPpbSP02HxgicM6xSSqzZuBVxpbcffqjMPXf8LkVX4iWKZtyzLpf34yaojigU3qF @@ -977,7 +950,6 @@ uid Deanna sub 5199F3DAE89C332D -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGCtdhoBDADdopjDt4eUNEqLJSw1ZICSR0oq09SOVtJSaSYdF8UiXjBfL1Ds fhTDqSv5pT2a2gLj0OU3tFhWHvINLaKKCjQnHVcFXi2LTxt+XBOjRYkFjHVisbaZ @@ -1012,7 +984,6 @@ zZsj/fMJ+OIZcAhE7UVae48GpW2kLATxmK01oSzvizIlmN3rVz2EnjOun2iuuEpF pub D364ABAA39A47320 sub 3F606403DCA455C8 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGH0NlsBEACnLJ3vl/aV+4ytkJ6QSfDFHrwzSo1eEXyuFZ85mLijvgGuaKRr c9/lKed0MuyhLJ7YD752kcFCEIyPbjeqEFsBcgU/RWa1AEfaay4eMLBzLSOwCvhD @@ -1054,7 +1025,6 @@ ikmfPIGVw73RF3HXjJ8GVqTkqbo4ZpgTw/7Z3+fAYE/vxquhnpl2HvE= pub D9C565AA72BA2FDD sub 9121AD263441EEDD -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBFrjUQUBDADTMQL/4d9EyVhsO4XBH9wbGWxcEJvsu/HvppN5fY8hpMV0+Cr9 wjAeJ7d9zdFJVB8vPLN7bb5dm6SNyK3KiOugqVgZrQ+ZPTvCCgFbFyEXuZwDiOa1 @@ -1090,7 +1060,6 @@ uid kaml GitHub Actions sub 66A2CBDE49E8A25D -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBGAwdRsBCADCXfWdHhywp8Rcgt834W/Z3MFEAxYdxjAJOTQhc/In1SJfIqi/ xD7OKHA2fbwzRnS/UmXkmElTK7JI3/1gWRm8kEaaHTnlI63Z9MZV0DHMpJMgvpFM @@ -1119,7 +1088,6 @@ uid Touchlab sub A947A3FCB1697B4F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBF7H/6gBCACbEuIbxWAfHEYViPqdpwxDYauxsYwk6FgA9sSO1nS95KRwx+Cs X6F8nRGnfLtbo6Ffcp6r58fNi9RvY7ueRGiL0kQd6c5GYx6dH1b91Q1qrdVOeEdj @@ -1148,7 +1116,6 @@ uid Google Api Client Libraries (Releases) sub 1B80C80E07BC7190 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGOtCzoBEAC7hGOPLFnfvQKzCZpJb3QYq8X9OiUL4tVa5mG0lDTeBBiuQCDy Iyhpo8IypllGG6Wxj6ZJbhuHXcnXSu/atmtrnnjARMvDnQ20jX77B+g39ZYuqxgw @@ -1225,7 +1191,6 @@ sub 9351716690874F25 sub 3D5839A2262CBBFB sub 60EB70DDAAC2EC21 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF/RX/MBDADSqelDQKobURExWUKALq86yTPMxMasxmDlccKFpk5xjWrryL7z qg4Fnb7IK5fKDtcnTANtOv2hlIli1h131+SmjJdD3qhfly7QoszOpr5izDS+FOCj @@ -1343,7 +1308,6 @@ pub E93671C7272B7B3F uid Rolf Lear (JDOM) (Used to sign JDOM Packages) -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFCPD00BCAC4tY8wMQTsCKyII/mMkUDAkXA2cLM47fY1Wn+iohtgtalUdA0v AhGvTdFU6/St35rOKNoyLC7Sy30FBYpAEfMB/x9j/CaQtdtGhaQU0hCvtWGhhS3J @@ -1361,7 +1325,6 @@ sub 3BD211F725778C36 sub 6C70A3B7599C5736 sub 8611CD28F472E006 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBERFeVERBACjfASThn15ynIICr0Gu8quGCl2rSSRar8TsjrbiwYB2MTW35Rg NjLU6MN5Nq4d5G8D5aMeoyGODstIHH8zA52sDGeHOMKfDaAraL+lGzElbpmaqP2s @@ -1432,7 +1395,6 @@ lpPJw3/+x6VdxMPe pub EE92349AD86DE446 sub E68665C8F91BDE69 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBGO91akBCADDDpIrW/IohUSJNDu9VOUlnfEOm5VS49uqM0uucLi0BeAhy1Fo P6Yg1cJkcK66DtnUoTM/JJLyDzJRlKnniLrYCkw8ScvtPdA5cQKJTY5ecn+9ouR2 @@ -1458,7 +1420,6 @@ DqhGe5NO7GoCns3XxqjpggME9eCEQooeKHlLCAkX2/XttwVSRlrNsdVb82iKy7E= pub F067A2FD751AE3E4 sub 28CFDE1EB61BB6AA -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mDMEYknmAxYJKwYBBAHaRw8BAQdA/xS5rgP6lF5fl8l+rJB1UiF+7KKDse0PmKYp TNBH7si4OARiSeYDEgorBgEEAZdVAQUBAQdA+9/L4P4Yhd5EIOE/I428Wqk+ljCs @@ -1471,7 +1432,6 @@ gQcqw8b0Mvn/5ebSPAD+PStCy1XQmd4nwEvaBySz9fCoa4khPiWQ2KaAObFh6gA= pub F0D0AE433308B042 sub 504F10B64E007C78 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFsRgCkBEADaI8lsWsDCfPfT1Vj4h/oY8EoZst/fG9wnMyLvfemLJWGVb20h uRe7vwBHhtczlAeRYtfNzQ1xLKXWNpMfiJNr8PeZVhZyTN7My3JYJZnmQm1MN53l @@ -1513,7 +1473,6 @@ pKABQ8EoM/ZbCW+B3eWOCbp1hsj6/LmJqcs0S/yrn24YGpdxUyUU56U= pub F1F111AF65925306 sub EF375EEBBDEFD775 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFS2J+0BCADZI8RYk32YeO9gnEkY9RN+4dKb+H1AR4v+IGxmy0UYy+O8bo4m YzkQHTlPpEPGe10/quKk1embDifEfNa9mwcSJl+XUPFlTrSA97SR31mdyK/Ua146 @@ -1539,7 +1498,6 @@ kkKatq4qx+xU7QMdeMs8STRj pub F3D1600878E85A3D sub 1C9F436B883DCCF6 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGAhOxEBEADdB5Jy2sSOndOMCTyk8IFIJYPogjXtN7CnyIlqr4jEB5G87TJf m7OxB95aIVS1vSA5ghCm88N1mKtW6jyYjgLFQbbyD9/X3ShVZjh8B2R4atL93SSK @@ -1583,7 +1541,6 @@ uid Jonathan Hedley sub 6064B04A9DC688E0 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEtsF2oRBACcai1CJgjBfgteTh61OuTg4dxFwvLSxXy8uM1ouJw5sMx+OKR9 Uq6pAZ1+NAUckUrha9J6qhQ+WQtaO5PI1Cz2f9rY+FBRx3O+jeTaCgGxM8mGUM5e @@ -1618,7 +1575,6 @@ uid Christopher Povirk sub B5CB27F94F97173B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE89LqsBCAC/C7QToaRF8eZgGOxcvp9aG+mFFCMjaRAb4Mh59OYdmUb6ZjfO 9388HPebGbPNR8SHYs0dBIuWY4ZJ7oUTYPswasL8vB0iPFdyHhvkCca+yk0b8ZBM @@ -1647,7 +1603,6 @@ uid Sean Leary sub 012F07EDD27CB2E2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mDMEZI8otBYJKwYBBAHaRw8BAQdAL5VNS8O2NJbsTZaMphHGdxsSaLUj0tZLI6+R /pve51q0HlNlYW4gTGVhcnkgPHN0bGVhcnlAZ21haWwuY29tPrg4BGSPKLQSCisG @@ -1663,7 +1618,6 @@ uid Chao Zhang sub 8C40458A5F28CF7B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGADx6IBDADoHin1LGQ8dhnlhfNCBZ3IyXS2NpR1VjmYtHSlh1hGsPcmHuwo 1mLA6JzXF7NuK3Y52pbTr6vz9bAap8Ysjq/3UJeiDbf7FvmO5xAEVUhrpc7AEY7G @@ -1700,7 +1654,6 @@ uid Carlos Ballesteros Velasco (Deploy) sub 74237AD167FFEE52 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBGBJD1kBCAC2OgrVeUz5GtDnUh1fSKqEDN+3tjFKmCKj92buwiDLz8sWtzEE ncMlGSic0yAVxMTNIlfq0ec1AFWIFKsMkcpYX435UapQz8S19XhIIROsy5i/bZcg @@ -1728,7 +1681,6 @@ buWxmtQIuXkdel5Pr+hpq7n11s1bjDcuprsJv7t3vuQGojw7u7HgchT3X2B+OXma pub 056ACA74D46000BF sub DECB4AA7ECD68C0E -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEoo3BYRBACXE2oGRA58Ml6s+kvfk6n/AJ+5OFeRT/Xelco/cpdxOVF5LkRk yd+vR2+F9ldBlH7CSTCmrdZIN3M3zrcWndrk/OQkCxNWVnE/a1li7L3G9nYr011k @@ -1756,7 +1708,6 @@ sub 3FF44D37464BBB7E sub 6A0975F8B1127B83 sub 6005789E24E5AD1E -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBFzy4ngBDAC4mz6ELMWjfJ8GZtolq3E96T7qjfp4J9FxGVxdbJxkEDnn6MTg V8zhD7yeSZcUSvwzPiDlB/b4RYnh+5LjzKHTsrtr9ja0SupuCkVGkMGWeHhpIGV9 @@ -1949,7 +1900,6 @@ uid Eclipse Project for JAXB sub 8118B3BCDB1A5000 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFu1EwUBEADAXapH49L1Lwt28iK737X/+4bRDE+lkMxehnUZ7QJs5zkFz5Sh 9K2rQO0PpvoMSdadGplFyhKdDP/iEUpzxTTbqMs5UjbJr0MoFfE957Vz59mNf9WY @@ -2030,7 +1980,6 @@ uid sksamuel sub 54EB00732104EF7A -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBF7ByYMBEADHxAxXj4u914xQb5fJ+sBvk0rKpqOZPFMIiuyNMD72Dk2jZbvW ESuRlzp9MObyylGTsxeX+f+Fq+piqqgAAFWyXx+JNV4UkDLSt8g6n0phW97Wj89b @@ -2075,7 +2024,6 @@ uid JetBrains Markdown sub FA258103C03E2F42 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGN3aiEBEACcTTRnXSSYz7c47qYZnsAITOilVO7xwCIG1ud1Ov7N/OLC9/Fr J+Me85WceOLPo5daOOO4nSjO9T4I1wgNQOrlgsYHWYaIeru9ucopXTc5vMkH6+r/ @@ -2120,7 +2068,6 @@ uid gradle-maven-publish-plugin sub 0E6A26CDAAFC89CD -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBF9qRXgBEADl/XqfEB2kT1CqdulQoYlRMVwVbvGlzFoRsuT9tl4GaTW6QsSv Xi/SiRG0rFFEDnWeraLTMw+2u7kTmbFat+/vRywB57QW7RWCyAhRiRs/gMCwP7mt @@ -2164,7 +2111,6 @@ FFj5 pub 0DA8A5EC02D11EAD sub 71499A87DC1FF84B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBE3LMfMRBAD90h69D8yyPWaSoAyh2mOOOZ/XH0isuBpDZCWptemlMHgImqdQ 2sXLXYT1bJKmSaMw+yKjp8J/NYk69EbmSK1C2nypLQtWhUmXXd3XVYw6hrG/dGvi @@ -2196,7 +2142,6 @@ uid Peter Palaga sub 83552A552A0D431C -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFBIm/wBCACgqvegptBhfKbyBXZiW+7XchIJCOpwq0/9QgSehKMwELbUKqNM sIVrywANqYn32S9hNRvBiKGm/KY7VwN9p1Cr6Ey3XuGSbRo/xN6tqfV/rV5YClL5 @@ -2225,7 +2170,6 @@ uid Andrey Shcheglov sub DF6A86F185ABFD5F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGNr014BEADSQF6XXGUwJ0karYxSSgQ3NsBzh7MWGXRAV4DMBdr7CWdAhapZ KNuSK7O/ATCvZuJV9bsCLuSz/1+ewKegRM2t+WcuG8xNQ3MujeVOic0m5kJoAUX9 @@ -2268,7 +2212,6 @@ DxGnlmEdxDXUOdd60XaDBDbqX5XZrqu3ze8UtX5lkIWfzIbWaTzG pub 15C71C0A4E0B8EDD sub 891E4C2D471515FE -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFcyNOoBEACj0zTN3GkRNAY3jihHZdGvi70i4R8mUfcQUwWGRsGGlzSwyJfe 20qNOHqwHaxVCAIp4e5paNf9cEKepOv5IqMkmaRdiC2W+BHDxcJgBot/IrC81ube @@ -2317,7 +2260,6 @@ sub 46C2130DFD2497F5 sub D101F7899D41F3C3 sub E074D16EB6FF4DE3 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFf0j5oBEADS6cItqCbf4lOLICohq2aHqM5I1jsz3DC4ddIU5ONbKXP1t0wk FEUPRzd6m80cTo7Q02Bw7enh4J6HvM5XVBSSGKENP6XAsiOZnY9nkXlcQAPFRnCn @@ -2866,7 +2808,6 @@ aYmN4OCGPjTRTqmNJRbdsgL88g== pub 1939A2520BAB1D90 sub D068F0D7B6A63980 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFHNxM8BCADYmt+HKkEwu89KQbwV7XIbgwZSfWc7y1HvA2YJpJRXJQsU/Pzv BhsHnm9ZIScBLIlgE5OUnMNz8ktPDdsFg3j/L0HREXOAqkOFxWx2kANsRo2HmkM3 @@ -2896,7 +2837,6 @@ sub CFF46EE3C17E53E9 sub C2148900BCD3C2AF sub 7D1BE4480B61E2A7 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGBP58sBDADYRZmxLOkqrz0QZ/yESRpv7IeHGLqDE1a8QfFtFb14MJCLSAAS 3nMD6Szi9mEjEqYdJURRcMjbUBhePgbhzGa3FYkjAB8lj6IKbu+ogCwVm1S8+caZ @@ -3015,7 +2955,6 @@ uid WillowTree sub 5BE125C87925F4B3 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mDMEY7d3lxYJKwYBBAHaRw8BAQdANOiFgriHFNDUJrXPLAjQCiIr19kAZqds47TA YYQWQiy0KVdpbGxvd1RyZWUgPGRldmVsb3BlckB3aWxsb3d0cmVlYXBwcy5jb20+ @@ -3030,7 +2969,6 @@ pub 280D66A55F5316C5 uid Brian Campbell (key for signing maven artifacts) -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFOOGVgBCACiDwUZOc6943aBGUrxikkfUnsyZfHtF9jihYmA1pSgfsye+JxR oG9QWW9+3qx4L/d4ZEqBftTWpsjyrY7NyMaeXtJEjE0vhiWNehgXB1z4XTJ66zCX @@ -3046,7 +2984,6 @@ YmVsbEBnbWFpbC5jb20+ pub 296CD27F60EED12C sub D95ECEC170500D9F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBFsHC7gBDADlkoJglNVbX9MShcAm6jvS5atCZwWT63gSasObXFxswsJQd1NK qryHNcj9tKBfLbSpMOoHeyyIKDdwdxN+6+N9Hi4hf0j1Ub6deJyI8ace8VERWaxF @@ -3082,7 +3019,6 @@ uid Ceki Gulcu sub 10DA72CD7FBFA159 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE+ZO+EBCAC3fZOOuYKthr0GcUge0PH2bh18sbM9XUmPKQz/W15l1NA/2ARS 2gUXM0R+SunMlun9KsqjnojJ2ObVPvbm1Hg/66JSRgR3JWfIpSlJxLicpfu8rCfN @@ -3110,7 +3046,6 @@ uid Markus KARG sub D091C8FFA534EDA2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGTNOPIBDACjeIqMmK4jo8NBVVacAwmqnL6H2/ixU/rPg1WEJSJRQbWu0otK Zrs+0tOVuYsQReW5tYUwI8hclSkdO95NC8bM7rlxcO6JSixsjzf2cOXajOAvuLMj @@ -3147,7 +3082,6 @@ uid Brad Corso sub 5CE9BCD2ED28F793 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF0vfHYBDADEDPY9ub98c7jQe4yMbPke3A/sxNHnn0WuA9JN880DPs3L7lrv 9VHTOlFXslDNBPYSbgFXH5YlMGg8ZY8bhngjc+Z3dtrCX1cAjUXOnibi7fBFomLB @@ -3184,7 +3118,6 @@ uid krzema12 (Piotr Krzeminski) sub 958D552911BCFB32 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGBM2rMBDAC/vuwIsVD0yQhNK5GF6eFRSxQxfG/XPXBQldx/+xTJaUtuItZe qxBTjmkwDP8m8jMm4iNtjHNOyfbN698nRC7QRRIheAw6MvqcTJNw+6WJku2vsxh4 @@ -3219,7 +3152,6 @@ qKx+doc5xpCPMyHPpo539DTLeowcp5O/tdkaqypfeSPf+ZOzLWBbMj9zsq48mSWV pub 36D4E9618F3ADAB5 sub C4935FA8AC763C70 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBGGiftwBDAC94Yhhh/5yO8jYFkg01MPnooXKZEPwxAbAg9wn5iM0tHxhEpkU zJVYZ+JYq013+Ldp8Of7A/d6hKTtZ0xwSeY7S/WFykIk6tc0P5j0sfFS3pGPDk+W @@ -3253,7 +3185,6 @@ q/tSGRQHXTwG53qejlUtKI315ZizOhJiniSDx4fZaK2zB9RlZkrnd1Y= pub 379CE192D401AB61 sub 0CFE993CDBE1D0A2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFTi8JIBEACcN1ucQ1uCOZ1owTELQV/6i4q7NbYdJ5wf7yPYfEugSo3yfbo3 Pw/XEvlnpDZmT155sGNOkteZtZMdcm5XhFbdtquLlrkjAcUGatq5rAt3eLAlvU7u @@ -3297,7 +3228,6 @@ uid Lasse Collin sub 5923A9D358ADF744 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBEzEOZIBEACxg/IuXERlDB48JBWmF4NxNUuuup1IhJAJyFGFSKh3OGAO2Ard sNuRLjANsFXA7m7P5eTFcG+BoHHuAVYmKnI3PPZtHVLnUt4pGItPczQZ2BE1WpcI @@ -3423,7 +3353,6 @@ VoXsnPIDNQ6LJGSfDmsaG/mRgZJEunVLGQFe2nsVqNmQxptLaTzty1Zv2dCOEm5W pub 3A1959EEF8726006 sub D908A43FB7EC07AC -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFu07rsBEADYizNlY0FYNZ6q2wx7AmWLw6PHje55uFhYM8Saqtwg/rm1tl78 j28E/coP2zMFf/ec+zqKsfYi4DMmLZ9ESIngMUOIE7mY0Pp4WN7oYFRtvU0ARWyp @@ -3479,7 +3408,6 @@ uid Carl Mastrangelo sub 9B2A1B698A113AAD -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFzwo60BEACg1rgL5jUtKkFE5DiwqJwxzJyJDH00TBSN6ZT+nXh1UxgC9q2h olF9V+2+LV1Jcmnc946xzIMiWLG33QB0NKVCdU5jNuLahOcViQQjNfGXwNzYoNCR @@ -3524,7 +3452,6 @@ uid Drew Hamilton sub 91FCCDE555C64A9F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBF42lroBEACWa+RCajazimveyzyVwzq+1Kj8eiJ1XPJXqvIerGOQ6Tx2qeSM 9AkMcfW7HeN6YW3BR/u2s7xe07D6p6c7UjTmiH1v23ELSk0Ou/BNxiTMdTSly77O @@ -3569,7 +3496,6 @@ uid Tatu Saloranta (cowtowncoder) sub 575D6C921D84AC76 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGL4BxIBEAC+lX44fd/zrVQPzdKygarBd/X0bBpGakT++Kfk4UBGl3q+wd2G R9puB9R377ds8hU7U3To8sHguUZo6DbD9Gb/is/WajSb9g92z+rMow3KbqfCYqWr @@ -3613,7 +3539,6 @@ LBaslDFjyxMECWr3v7TuEmEmNcD+KwNyACFNuBjEBWeuJZYwCkAkVy8AyitrTMh8 pub 3F36885C24DF4B75 sub 97859F2FE8EAEB26 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFmfSwYBCADdZEuR8cs2ejLLW3+Glxiq15rVbHbxaWmmZApGNijFro/LzFrR z+99N1mnA5+Ar/yKmn8lsCiTWukGQzWbdH/QSRUdyHtzxbCSeONdMhdKl3sJY1h2 @@ -3639,7 +3564,6 @@ fwS6/GYF9IKUp/WVQvhZ952mwzfrz9r1PbTg/fOo+MOGywdBZpEEPTL5pvfrrOYg pub 40A3C4432BD7308C sub C0B9C2CC3DD97C16 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE5zrtcBCADFfU0ugIGUCM44fqPJKrsB3TaDu5EpauvFfYqUfyookzMHSKtB 4YqBSKzBEiZ1rFB/KCn7XJTh5epoCau4DsG4U0XZjsx+esDR4ZtL42LEzeMTuluV @@ -3667,7 +3591,6 @@ uid Sebastian Sampaoli sub D94994D14B55169B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mDMEY4fp+xYJKwYBBAHaRw8BAQdArb04PVwQKvEhtUEmEu7/aASZivOWgEkZBqX0 Tovwvq+0J1NlYmFzdGlhbiBTYW1wYW9saSA8c3NhbXBhb2xpQGVxdW8uZGV2Prg4 @@ -3678,10 +3601,29 @@ xXZy2unHAPYyfxDLPkbTR7Mm4k8Cva8PCcXotDow4bDLm9rhwVkJ =Hgs4 -----END PGP PUBLIC KEY BLOCK----- +pub 45D0CAA6D26B0F7D +uid Open Source + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGO20jEBEADDfG4vnhaVJ35Nn55d87eOPv3+3yWV+aR7TWQMGfOl8N32tNlV +rFn8x8aks7jXzW66EOeDZKDjM2X259p/eDyXDDRE+4Ade5KzKKFuKMYcO7hHcjk1 +m9fVpEBE1eg73VetWGb4MfauFbWYKKBniBYzKyLMokQ8gl/wUC0hVAzGPCXSo+9r +1tobq2K2OS9SRUhEVYkzrdkPINfxyY7/SkKtzhoPqv1ICIOJHb5NQmhU3YDbHQAL +oAaWON+sd+kkgbvFesgQK14PuFocDdlatI778PA6gT6ah6zRvl4654Ypsx9gF8DT +PkkFZtwx/vb/89MZ7GykF2XH+TC1hMBQ2HW0QVCVVE0ah2rQQ7OqcOkCMHWFTMEV +/4iEeRKX11q3AzC5xcA4EFJLe4Aoe7F+uyuut8ey7Iy0GdBldTOzM4jEFdMj23q/ +aqUUmrz1JbNnAtG3pfcfUuJ1nAaylcQ5Q8g7i9434eZhEeYndPiq1zr0Oo331zYh +JeNY3Y+Pg+TE6uwizgjaPW96Zcdqv6wzB+DWOfU6Mozs57569cDTC8p/lb6M/0Pz +5IudFyyRaKoqsHjhBUxMG/sbjBxv6leZ05020a5AZpBAqLwRjCPnL6F4QOIllyoe +G+WauXxsNZ5w8NpJIEjZ0PrYoTe60SRrwwQa8mF9fC/eBapd1SFcBud6WQARAQAB +tCVPcGVuIFNvdXJjZSA8b3BlbnNvdXJjZUBwYWxhbnRpci5jb20+ +=8bW6 +-----END PGP PUBLIC KEY BLOCK----- + pub 47DCFC2A59F59B5B sub FCB1A11865F6A17A -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFVB0KABCAC8YRgcTIomAMw865DHxS/tbFgqN9i7M+tgpih1ETJbb4enhIBj Upeq+MoFCtxN86zGu2gsA4DOMEXVCReJ4O5n0F8E03+NUraCnJjbXLW9eEyRQRaU @@ -3709,7 +3651,6 @@ uid Adam Cozzette sub 726F4E5C34CFD750 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF8QwXwBDADKNLAHhjWUqnLYiO+ws3Hy1du6tMvkR3nfsnIDqpCvSjb+3/rI OHSyq8TbaGLLuHOM4K/KvrKgjhTbXQxvx1WR5IpoylcINzI959yAbaywBj6gVQB3 @@ -3746,7 +3687,6 @@ uid Henri Z. Sweers (Zac Sweers. For Bintray/Maven signings.) sub 9D29AE4A6B50E01F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQMuBEwVZOURCADNnKQzSjFuI9/IGj3WTJcPU2B/H8NbZaTsz5WE91WumgZulK2q YeD4u6zdOyFK7DEScgxk7dicox9cNEgYKQnQXctDhfqER9bnvA2iJ+AFxjRAWyvs @@ -3975,7 +3911,6 @@ CgkQWwXM3hQMKHbfCwEA0NIOfYpbPsdvmB4PBRNfhPxSqfbV4Vunni0VN+ikJ38A pub 5F69AD087600B22C sub 0440006D577EAE4B -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE7JURcBCADO+9Dc4/JnB+wX+fq+Fr2zUGSPOT6/qjE5kXL4FEbJKsqDSAKG VnbtRrsIUdmNIFQmz71bBDFhRBbrSrkz927k8eUPhYtxE2NmmWSuKgrjF4qviPQv @@ -4001,7 +3936,6 @@ hsWaeXOM0n2j759uNb/Nd2XA pub 6425559C47CC79C4 sub D547B4A01F74AC1E -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE3XFIUBCADcj1zw8m1evCgEMqxgOfl6L8y1tsYWsX7tVPvHEkYlXHrdcpkB fGuWPrauvhBmB9sBkFfxzU98Ilz3Xk9pfISYiaMUk9Mk1ZxsCoYPVhxvOSvk5LgS @@ -4028,7 +3962,6 @@ pub 66B50994442D2D40 uid Square Clippy -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBGDoYisBEACqUDZnT4h6ma6XIzdC6KR++uDbR2VKdhCuv0Og/sHEKkm6ZbG0 OFB8tAaQx/WlsoQyf3DlLfUEOGDai875Aqor3fbM+E1hrZbQNfsOySKEE52k7PYe @@ -4050,7 +3983,6 @@ uid Ceki Gulcu sub A1766BE5F812AC2E -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mJMEYvEGpBMFK4EEACMEIwQA6knc/2gtbqDhPh5EzrymR4Hwi1Xf2S0aqMopA1zg IeZzBgSfL+4fEfpXL4eAzvrk29jIXSizDEOgFpw3PW3Om1gASxub4Jo6EQrRgOdd @@ -4072,7 +4004,6 @@ uid Paul King sub EA8543C570FAF804 sub CA890A5FA09CFD80 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFgMcBMBEAC/xcIVVOOh+F7S0OTzBlFH34s5fDbi6Zto469tZyW1peyWtXAZ m+2jzFfeTCHaUQO3YjoTy2fPygS4tVD+ew4EAzMG5Uti4kwWZw0PYKz2JO/gl1JY @@ -4140,7 +4071,6 @@ uid Daniel Lemire sub 1723844CF9A045EC -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE7+huMBCADW9rfqKBXOqUSLCK5Klag5WqLFxAOddqEM7wTx/42XaIKjDiAW gmFnV4XBKm/7Z4fwWq7+ku6NDYUjBpI4vcQ2hYJJ4SRWZHT5wWzOmqgznf+/Qwug @@ -4167,7 +4097,6 @@ lV/Shw== pub 7457CA33C3CE9E15 sub ABE9F3126BB741C1 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFIXyRQBCADe285y3Pu7KzoKyP6wqeNXtvvuwMatAmPm5x/i+S8MlryqzsYa x6twUmXV1yKjjtGrO+9fHvTOWBfSSP+fP9KTaTQYSasoJq2Mw4cQDy1i0zrxNZUw @@ -4206,7 +4135,6 @@ sub 1397BC53640DB551 sub 6494C6D6997C215E sub 78BD65473CB3BD13 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQINBFcMjNMBEAC6Wr5QuLIFgz1V1EFPlg8ty2TsjQEl4VWftUAqWlMevJFWvYEx BOsOZ6kNFfBfjAxgJNWTkxZrHzDl74R7KW/nUx6X57bpFjUyRaB8F3/NpWKSeIGS @@ -4596,7 +4524,6 @@ uid Rob Manning sub AC9F6F1991913E30 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEqXMWkRBACnsxVroe9ojc2AnRn/85KJi/Ntsbku5iJ5z72B6I+VGn/b1Xln kuvRJ41RLG13lKVmHtSTq2pajjmAr9jY5gS8nJ3JUES9bG3yKNN1IDswXExfAUJp @@ -4639,7 +4566,6 @@ uid Oleg Kalnichevski sub 926DFB2EDB329089 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBEPonucRBACtbhYckAoyz1tuSXYX4XiqGa5390gIMcxe2hJ+Ncx9o3zX09Im f8PW27BnMrz7EIydgB2wphhjfK4vkNNtm5ZDWH/zJStsk1Fe7lNuuxs8XorX1+8D @@ -4671,7 +4597,6 @@ sub 72FF58594F983302 sub 0588BC69A286FF16 sub 3967D4EDA591B991 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGNBF+TCd4BDACbIA94MfIWL0SpvZwBddXgx36Lp9GYOWNgGoQCWSvk9vaMrLaI rEll0xnoP98CfBQYrVSAmHDMhSLBCjNB3V1Sdz8GRdOG7HUffF7Cqwbm3Fxo3H/h @@ -4752,7 +4677,6 @@ uid Niall Gallagher (www.npgall.com) sub DC0B7E986BD7398F -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBE9/RAsBCADI/pVIFcoLmbq4LCKkqeN4i5xgGKsuQsDAf/ndFkILDUA2FaPN 7cI3EvZacWnWUA0QkkKNKpajU2OjjQlu4IyBosJht3VMtD0BJ2nL8eIDvwO6L8TS @@ -4788,7 +4712,6 @@ uid Erik C. Thauvin sub 776702A6A2DA330E sub 3565C12F190E4CB2 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQGiBDZlGC4RBAD71K/vOcX69tHOv4e6nuIGqbqooKxURWJhe1OvoK9Z1pgadt5D Ct0HDuSGydkA91cAM3a2QzZmGepGS8r3s3ldTf83uBfsriYM+yXmalmHYNdMVrPL @@ -4843,7 +4766,6 @@ FfHu2whpwaX1/YaS03SxvtT8hegAnRSdQ88UIcXYj2PkFOiuFPrFBvee pub 7FE9900F412D622E sub AE6B5325E74ED034 -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v@RELEASE_NAME@ mQENBFnyVlkBCACe8zGkIlDV0dUKmk9PWe2Hw8qM9DdPbtpUOpmUOidGY5svQDL3 eqvHk85TbxqFEe3Qbjjt+R+iApFuXy5kmueXTvwCm7nAU+k/pZtPuzHyhDs3iFFH diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 407b59b..55752c4 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -153,6 +153,11 @@ + + + + + @@ -203,11 +208,21 @@ + + + + + + + + + + @@ -233,6 +248,11 @@ + + + + + @@ -273,6 +293,11 @@ + + + + + @@ -283,6 +308,11 @@ + + + + + @@ -308,6 +338,11 @@ + + + + + @@ -338,16 +373,31 @@ + + + + + + + + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbDumpResponseParser.jvm.kt b/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbDumpResponseParser.jvm.kt index a31f5de..7c4dc07 100644 --- a/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbDumpResponseParser.jvm.kt +++ b/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbDumpResponseParser.jvm.kt @@ -18,7 +18,7 @@ import ru.pixnews.igdbclient.model.dump.IgdbDumpSummary @InternalIgdbClientApi internal actual fun IgdbParser.igdbDumpJsonParser(source: BufferedSource): IgdbDump { val response = source.readUtf8() - val tokener = JSONTokener(response).nextValue() as? JSONObject ?: error("Malformed JSON") + val tokener = response.jsonTokener().nextValue() as? JSONObject ?: error("Malformed JSON") return IgdbDump( s3Url = tokener.getString("s3_url"), endpoint = tokener.getString("endpoint"), diff --git a/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbErrorResponseParser.jvm.kt b/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbErrorResponseParser.jvm.kt index 4a24e91..539c862 100644 --- a/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbErrorResponseParser.jvm.kt +++ b/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbErrorResponseParser.jvm.kt @@ -8,7 +8,6 @@ package ru.pixnews.igdbclient.internal.parser import okio.BufferedSource import org.json.JSONArray import org.json.JSONObject -import org.json.JSONTokener import ru.pixnews.igdbclient.InternalIgdbClientApi import ru.pixnews.igdbclient.error.IgdbHttpErrorResponse @@ -18,7 +17,7 @@ import ru.pixnews.igdbclient.error.IgdbHttpErrorResponse @InternalIgdbClientApi public actual fun IgdbParser.igdbErrorResponseParser(source: BufferedSource): IgdbHttpErrorResponse { val response = source.readUtf8() - val tokener = JSONTokener(response).nextValue() as? JSONArray ?: error("Malformed JSON") + val tokener = response.jsonTokener().nextValue() as? JSONArray ?: error("Malformed JSON") return IgdbHttpErrorResponse(readMessageArray(tokener)) } diff --git a/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbWebhookListJsonParser.jvm.kt b/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbWebhookListJsonParser.jvm.kt index 025ca41..147d9a3 100644 --- a/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbWebhookListJsonParser.jvm.kt +++ b/igdbclient-core/src/jvmMain/kotlin/internal/parser/IgdbWebhookListJsonParser.jvm.kt @@ -8,13 +8,12 @@ package ru.pixnews.igdbclient.internal.parser import okio.BufferedSource import org.json.JSONArray import org.json.JSONObject -import org.json.JSONTokener import ru.pixnews.igdbclient.model.IgdbWebhook import ru.pixnews.igdbclient.model.IgdbWebhookId internal actual fun IgdbParser.igdbWebhookListJsonParser(source: BufferedSource): List { val response = source.readUtf8() - val jsonArray = JSONTokener(response).nextValue() as? JSONArray ?: error("Malformed JSON") + val jsonArray = response.jsonTokener().nextValue() as? JSONArray ?: error("Malformed JSON") return (0 until jsonArray.length()) .map { index -> val webhookObject = jsonArray.get(index) as? JSONObject ?: error("No object at index $index") diff --git a/igdbclient-core/src/jvmMain/kotlin/internal/parser/JsonTokenerExt.kt b/igdbclient-core/src/jvmMain/kotlin/internal/parser/JsonTokenerExt.kt new file mode 100644 index 0000000..b367256 --- /dev/null +++ b/igdbclient-core/src/jvmMain/kotlin/internal/parser/JsonTokenerExt.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2025, the Igdbclient project authors and contributors. Please see the AUTHORS file for details. + * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + */ + +package ru.pixnews.igdbclient.internal.parser + +import org.json.JSONParserConfiguration +import org.json.JSONTokener + +private val parserConfiguration = JSONParserConfiguration() + .withStrictMode() + +internal fun String.jsonTokener(): JSONTokener = JSONTokener(this).apply { + this.jsonParserConfiguration = parserConfiguration +} diff --git a/igdbclient-core/src/jvmMain/kotlin/internal/parser/TwitchTokenErrorResponseParser.jvm.kt b/igdbclient-core/src/jvmMain/kotlin/internal/parser/TwitchTokenErrorResponseParser.jvm.kt index 0000804..b177082 100644 --- a/igdbclient-core/src/jvmMain/kotlin/internal/parser/TwitchTokenErrorResponseParser.jvm.kt +++ b/igdbclient-core/src/jvmMain/kotlin/internal/parser/TwitchTokenErrorResponseParser.jvm.kt @@ -7,7 +7,6 @@ package ru.pixnews.igdbclient.internal.parser import okio.BufferedSource import org.json.JSONObject -import org.json.JSONTokener import ru.pixnews.igdbclient.InternalIgdbClientApi import ru.pixnews.igdbclient.internal.twitch.TwitchErrorResponse @@ -19,7 +18,7 @@ import ru.pixnews.igdbclient.internal.twitch.TwitchErrorResponse @InternalIgdbClientApi public actual fun IgdbParser.twitchTokenErrorResponseParser(source: BufferedSource): TwitchErrorResponse { val response = source.readUtf8() - val jsonObject = JSONTokener(response).nextValue() as? JSONObject ?: error("Malformed JSON") + val jsonObject = response.jsonTokener().nextValue() as? JSONObject ?: error("Malformed JSON") return TwitchErrorResponse( status = jsonObject.optInt("status"), message = jsonObject.optString("message"), diff --git a/igdbclient-core/src/jvmMain/kotlin/internal/parser/TwitchTokenParser.jvm.kt b/igdbclient-core/src/jvmMain/kotlin/internal/parser/TwitchTokenParser.jvm.kt index 7d6cd60..023ce2d 100644 --- a/igdbclient-core/src/jvmMain/kotlin/internal/parser/TwitchTokenParser.jvm.kt +++ b/igdbclient-core/src/jvmMain/kotlin/internal/parser/TwitchTokenParser.jvm.kt @@ -7,7 +7,6 @@ package ru.pixnews.igdbclient.internal.parser import okio.BufferedSource import org.json.JSONObject -import org.json.JSONTokener import ru.pixnews.igdbclient.InternalIgdbClientApi import ru.pixnews.igdbclient.internal.model.TwitchToken @@ -19,7 +18,7 @@ import ru.pixnews.igdbclient.internal.model.TwitchToken @InternalIgdbClientApi public actual fun IgdbParser.twitchTokenParser(source: BufferedSource): TwitchToken { val response = source.readUtf8() - val jsonObject = JSONTokener(response).nextValue() as? JSONObject ?: error("Malformed JSON") + val jsonObject = response.jsonTokener().nextValue() as? JSONObject ?: error("Malformed JSON") return TwitchToken( accessToken = jsonObject.getString("access_token"), expiresIn = jsonObject.optLong("expires_in"), diff --git a/igdbclient-integration-tests/src/jvmMain/kotlin/BaseIgdbDumpApiImplementationTest.kt b/igdbclient-integration-tests/src/jvmMain/kotlin/BaseIgdbDumpApiImplementationTest.kt index cf9221e..a0c0be0 100644 --- a/igdbclient-integration-tests/src/jvmMain/kotlin/BaseIgdbDumpApiImplementationTest.kt +++ b/igdbclient-integration-tests/src/jvmMain/kotlin/BaseIgdbDumpApiImplementationTest.kt @@ -82,7 +82,7 @@ abstract class BaseIgdbDumpApiImplementationTest { "franchises": "LONG[]", "rating": "DOUBLE", "created_at": "TIMESTAMP", - "checksum": "UUID", + "checksum": "UUID" } } """ diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index bbc75ef..8dff92e 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -52,33 +52,12 @@ dependencies: "@types/node" "*" -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.40.2" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.40.2.tgz#2833bc112d809677864a4b0e7d1de4f04d7dac2d" - integrity sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" - integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== - "@types/estree@^1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== -"@types/json-schema@*", "@types/json-schema@^7.0.8": +"@types/json-schema@^7.0.8": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== @@ -234,13 +213,6 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abort-controller@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== - dependencies: - event-target-shim "^5.0.0" - accepts@~1.3.4: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -639,10 +611,10 @@ engine.io@~6.5.2: engine.io-parser "~5.2.1" ws "~8.11.0" -enhanced-resolve@^5.17.0: - version "5.17.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" - integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== +enhanced-resolve@^5.17.1: + version "5.18.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz#91eb1db193896b9801251eeff1c6980278b1e404" + integrity sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -707,11 +679,6 @@ estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== -event-target-shim@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" - integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== - eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -1095,10 +1062,10 @@ karma-webpack@5.0.1: minimatch "^9.0.3" webpack-merge "^4.1.5" -karma@6.4.3: - version "6.4.3" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8" - integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q== +karma@6.4.4: + version "6.4.4" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492" + integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w== dependencies: "@colors/colors" "1.5.0" body-parser "^1.19.0" @@ -1130,6 +1097,13 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +kotlin-web-helpers@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286" + integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw== + dependencies: + format-util "^1.0.5" + loader-runner@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" @@ -1233,10 +1207,10 @@ mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mocha@10.7.0: - version "10.7.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a" - integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA== +mocha@10.7.3: + version "10.7.3" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752" + integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A== dependencies: ansi-colors "^4.1.3" browser-stdout "^1.3.1" @@ -1284,13 +1258,6 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" - node-releases@^2.0.14: version "2.0.14" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" @@ -1727,11 +1694,6 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== - type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -1798,11 +1760,6 @@ watchpack@^2.4.1: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== - webpack-cli@5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" @@ -1842,12 +1799,11 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.93.0: - version "5.93.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" - integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== +webpack@5.94.0: + version "5.94.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" + integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== dependencies: - "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" "@webassemblyjs/ast" "^1.12.1" "@webassemblyjs/wasm-edit" "^1.12.1" @@ -1856,7 +1812,7 @@ webpack@5.93.0: acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.0" + enhanced-resolve "^5.17.1" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" @@ -1872,14 +1828,6 @@ webpack@5.93.0: watchpack "^2.4.1" webpack-sources "^3.2.3" -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - which@^1.2.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -1918,10 +1866,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== +ws@8.18.0: + version "8.18.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" + integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== ws@~8.11.0: version "8.11.0"