From 3024e5624863e9f06b1be8b318d0b33963389056 Mon Sep 17 00:00:00 2001 From: Art Shendrik Date: Mon, 22 Apr 2024 03:46:04 +0100 Subject: [PATCH] [WIP] build(deps)!: bump Kotlin to 2.0.0-RC3 - remove deprecated Kotlin/Native targets, removed in Kotlin 2.0 Signed-off-by: Art Shendrik --- .github/workflows/build.yml | 4 +- CHANGELOG.md | 1 + README.md | 48 +- checks/compose-desktop/build.gradle.kts | 4 +- checks/gradle-plugin/build.gradle.kts | 6 +- .../gradle-plugin/dependencies/classpath.txt | 50 +- checks/kmp/.kotlin-js-store/yarn.lock | 794 +++++++++++------- checks/kmp/dependencies/classpath.txt | 45 +- dependencies/classpath.txt | 54 +- fluxo-kmp-conf/build.gradle.kts | 3 +- .../dependencies/compileClasspath.txt | 37 +- fluxo-kmp-conf/detekt-baseline.xml | 3 - .../src/main/kotlin/DependencyUtils.kt | 5 +- .../src/main/kotlin/KmpHierarchyTemplate.kt | 6 +- .../src/main/kotlin/KotlinJsUtils.kt | 66 +- .../kotlin/MultiplatformSourceSetUtils.kt | 23 +- .../container/KmpConfigurationContainerDsl.kt | 8 +- .../conf/dsl/container/impl/ContainerImpl.kt | 2 - .../impl/KmpConfigurationContainerDslImpl.kt | 10 +- .../conf/dsl/container/impl/KmpTargetCode.kt | 26 +- .../container/impl/KmpTargetContainerImpl.kt | 19 - .../impl/target/TargetAppleIosContainer.kt | 14 - .../target/TargetAppleWatchosContainer.kt | 17 - .../impl/target/TargetLinuxContainer.kt | 26 - .../impl/target/TargetMingwContainer.kt | 14 - .../impl/target/TargetWasmNativeContainer.kt | 34 - .../dsl/container/target/AppleIosTarget.kt | 9 - .../container/target/AppleWatchosTarget.kt | 7 - .../conf/dsl/container/target/LinuxTarget.kt | 12 - .../conf/dsl/container/target/MingwTarget.kt | 7 - .../dsl/container/target/WasmNativeTarget.kt | 23 - .../conf/feat/KotlinSetupDiagnosticTasks.kt | 3 - .../kotlin/fluxo/conf/feat/SetupDetekt.kt | 2 +- .../fluxo/conf/feat/SetupPublication.kt | 9 +- .../fluxo/conf/feat/SetupTestsReport.kt | 1 - .../fluxo/conf/impl/DependencyHandlerUtils.kt | 6 +- .../conf/impl/kotlin/KotlinConfigSetup.kt | 2 +- .../conf/impl/kotlin/SetupKotlinOptions.kt | 8 - gradle/libs.versions.toml | 26 +- gradle/wrapper/gradle-wrapper.properties | 4 +- self/build.gradle.kts | 1 + updateBaseline | 4 +- 42 files changed, 704 insertions(+), 739 deletions(-) delete mode 100644 fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetWasmNativeContainer.kt delete mode 100644 fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/WasmNativeTarget.kt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a2382ae..f6f6787c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,7 +112,7 @@ jobs: # amend the `dependencyGuardBaseline` and `kotlinUpgradeYarnLock` task results - name: Initialize CodeQL - if: matrix.os == 'ubuntu' + if: false # matrix.os == 'ubuntu' uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} @@ -177,7 +177,7 @@ jobs: compression-level: 9 - name: Perform CodeQL Analysis - if: matrix.os == 'ubuntu' + if: false # matrix.os == 'ubuntu' timeout-minutes: 6 uses: github/codeql-action/analyze@v3 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3059eb1e..53be94ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ [//]: # (Removed, Added, Changed, Fixed, Updated) ### Updated +- bump Kotlin to _2.0.0-RC3_. - bump com.mikepenz.aboutlibraries to _11.1.4_. diff --git a/README.md b/README.md index 05ebc7e3..b8f4f152 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ Convenience Gradle plugin for reliable configuration of Kotlin & KMP projects Initially made for the [Fluxo][fluxo] state management framework and other libraries, then published for general use. Targeted for Gradle 8+ and Kotlin 1.9+. Built with:
-[![Kotlin](http://img.shields.io/badge/Kotlin-1.9.23-7F52FF?logo=kotlin&logoWidth=10&logoColor=7F52FF&labelColor=2B2B2B)](https://github.com/JetBrains/Kotlin) -[![Gradle](http://img.shields.io/badge/Gradle-8.7-f68244?logo=gradle&labelColor=2B2B2B)](https://gradle.org/releases/) +[![Kotlin](http://img.shields.io/badge/Kotlin-2.0.0-RC3-7F52FF?logo=kotlin&logoWidth=10&logoColor=7F52FF&labelColor=2B2B2B)](https://github.com/JetBrains/Kotlin) +[![Gradle](http://img.shields.io/badge/Gradle-8.8-f68244?logo=gradle&labelColor=2B2B2B)](https://gradle.org/releases/) [![Android Gradle Plugin](http://img.shields.io/badge/Android--Gradle--Plugin-8.4-0E3B1A?logo=android&labelColor=2B2B2B)](https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google) ### How to use @@ -32,7 +32,7 @@ Targeted for Gradle 8+ and Kotlin 1.9+. Built with:
```kotlin // in the `build.gradle.kts` of the target module plugins { - kotlin("multiplatform") version "1.9.23" + kotlin("multiplatform") version "2.0.0-RC3" id("io.github.fluxo-kt.fluxo-kmp-conf") version "0.8.1" // <-- add here } ``` @@ -45,7 +45,7 @@ plugins { ```kotlin // in the `build.gradle.kts` of the target module plugins { - kotlin("multiplatform") version "1.9.23" + kotlin("multiplatform") version "2.0.0-RC3" id("io.github.fluxo-kt.fluxo-kmp-conf") // <-- add here, no version needed for jitpack usage } ``` @@ -81,20 +81,14 @@ pluginManagement { | '-- android '-- nonJvm |-- commonJs - |-- js - '-- commonWasm (unstable, may be not available) - |-- wasmJs - '-- wasmWasi + | |-- js + | '-- commonWasm (unstable, may be not available) + | |-- wasmJs + | '-- wasmWasi (experimental) '-- native - |-- androidNative (tier 3) - | |-- androidNativeArm32 - | |-- androidNativeArm64 - | |-- androidNativeX64 - | '-- androidNativeX86 - |-- unix + |-- nix (unix-like systems) | |-- apple | | |-- ios - | | | |-- iosArm32 (deprecated) | | | |-- iosArm64 | | | |-- iosX64 | | | '-- iosSimulatorArm64 @@ -110,19 +104,19 @@ pluginManagement { | | |-- watchosArm64 | | |-- watchosDeviceArm64 (tier 3) | | |-- watchosX64 - | | |-- watchosX86 (deprecated) | | '-- watchosSimulatorArm64 - | '-- linux - | |-- linuxArm32Hfp (deprecated) - | |-- linuxArm64 - | |-- linuxMips32 (deprecated) - | |-- linuxMipsel32 - | '-- linuxX64 (deprecated) - |-- mingw - | |-- mingwX64 - | '-- mingwX86 (deprecated) - '-- wasmNative - '-- wasm32 (deprecated) + | |-- linux + | | |-- linuxArm32Hfp (deprecated) + | | |-- linuxArm64 + | | '-- linuxX64 + | '-- androidNative (tier 3, can has limited set of POSIX APIs) + | |-- androidNativeArm32 + | |-- androidNativeArm64 + | |-- androidNativeX64 + | '-- androidNativeX86 + '-- mingw + |-- mingwX64 + '-- mingwX86 (deprecated) ``` diff --git a/checks/compose-desktop/build.gradle.kts b/checks/compose-desktop/build.gradle.kts index ed970ad6..54ba5d1b 100644 --- a/checks/compose-desktop/build.gradle.kts +++ b/checks/compose-desktop/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.compose) alias(libs.plugins.jetbrains.compose) id("io.github.fluxo-kt.fluxo-kmp-conf") } @@ -28,9 +29,10 @@ tasks.named("jar") { // https://github.com/JetBrains/compose-multiplatform/blob/e1aff75/tutorials/Native_distributions_and_local_execution/README.md fkcSetupKotlinApp { + javaLangTarget = "17" + useJdkRelease = false replaceOutgoingJar = true shrink { fullMode = true } - shrinkWithProGuard() } dependencies { diff --git a/checks/gradle-plugin/build.gradle.kts b/checks/gradle-plugin/build.gradle.kts index 58fc5c5e..82c5ec8b 100644 --- a/checks/gradle-plugin/build.gradle.kts +++ b/checks/gradle-plugin/build.gradle.kts @@ -9,7 +9,11 @@ group = "io.github.fluxo-kt" version = libs.versions.version.get() fkcSetupGradlePlugin { - allWarningsAsErrors = true + javaLangTarget = "20" + useJdkRelease = false + + allWarningsAsErrors = false + enableApiValidation = false // Two separate processing chains. // First provides the output jar for the module. diff --git a/checks/gradle-plugin/dependencies/classpath.txt b/checks/gradle-plugin/dependencies/classpath.txt index 763f1b4f..9ad92fa9 100644 --- a/checks/gradle-plugin/dependencies/classpath.txt +++ b/checks/gradle-plugin/dependencies/classpath.txt @@ -10,6 +10,7 @@ com.dropbox.dependency-guard:com.dropbox.dependency-guard.gradle.plugin:0.5.0 com.dropbox.dependency-guard:dependency-guard:0.5.0 com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.51.0 com.github.ben-manes:gradle-versions-plugin:0.51.0 +com.google.code.gson:gson:2.8.9 com.googlecode.concurrent-trees:concurrent-trees:2.6.1 com.googlecode.javaewah:JavaEWAH:1.2.3 com.gradle.plugin-publish:com.gradle.plugin-publish.gradle.plugin:1.2.1 @@ -45,35 +46,30 @@ org.checkerframework:checker-qual:3.21.2 org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r org.eclipse.platform:org.eclipse.osgi:3.18.300 org.jetbrains.intellij.deps:trove4j:1.0.20200330 -org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.23 -org.jetbrains.kotlin:kotlin-android-extensions:1.9.23 -org.jetbrains.kotlin:kotlin-build-tools-api:1.9.23 -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-compiler-runner:1.9.23 -org.jetbrains.kotlin:kotlin-daemon-client:1.9.23 -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.23 -org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.23 -org.jetbrains.kotlin:kotlin-native-utils:1.9.23 -org.jetbrains.kotlin:kotlin-project-model:1.9.23 +org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-build-statistics:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-build-tools-api:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-compiler-runner:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-daemon-client:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-native-utils:2.0.0-RC3 org.jetbrains.kotlin:kotlin-reflect:1.9.22 -org.jetbrains.kotlin:kotlin-script-runtime:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-common:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.23 +org.jetbrains.kotlin:kotlin-script-runtime:2.0.0-RC3 org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -org.jetbrains.kotlin:kotlin-tooling-core:1.9.23 -org.jetbrains.kotlin:kotlin-util-io:1.9.23 -org.jetbrains.kotlin:kotlin-util-klib:1.9.23 -org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.14.0 -org.jetbrains.kotlinx:binary-compatibility-validator:0.14.0 +org.jetbrains.kotlin:kotlin-tooling-core:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-util-io:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-util-klib:2.0.0-RC3 +org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.15.0-Beta.2 +org.jetbrains.kotlinx:binary-compatibility-validator:0.15.0-Beta.2 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0 org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1 org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2 diff --git a/checks/kmp/.kotlin-js-store/yarn.lock b/checks/kmp/.kotlin-js-store/yarn.lock index 07e0a7f9..6e90da6b 100644 --- a/checks/kmp/.kotlin-js-store/yarn.lock +++ b/checks/kmp/.kotlin-js-store/yarn.lock @@ -7,6 +7,18 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + "@jridgewell/gen-mapping@^0.3.0": version "0.3.3" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -39,7 +51,15 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": +"@jridgewell/trace-mapping@^0.3.20": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@jridgewell/trace-mapping@^0.3.9": version "0.3.20" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f" integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q== @@ -52,6 +72,11 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + "@types/body-parser@*": version "1.19.4" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.4.tgz#78ad68f1f79eb851aa3634db0c7f57f6f601b462" @@ -60,17 +85,17 @@ "@types/connect" "*" "@types/node" "*" -"@types/bonjour@^3.5.9": - version "3.5.12" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.12.tgz#49badafb988e6c433ca675a5fd769b93b7649fc8" - integrity sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg== +"@types/bonjour@^3.5.13": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956" + integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ== dependencies: "@types/node" "*" -"@types/connect-history-api-fallback@^1.3.5": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz#acf51e088b3bb6507f7b093bd2b0de20940179cc" - integrity sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q== +"@types/connect-history-api-fallback@^1.5.4": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3" + integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw== dependencies: "@types/express-serve-static-core" "*" "@types/node" "*" @@ -98,11 +123,16 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^1.0.0": +"@types/estree@*": version "1.0.3" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.3.tgz#2be19e759a3dd18c79f9f436bd7363556c1a73dd" integrity sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ== +"@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/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": version "4.17.39" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz#2107afc0a4b035e6cb00accac3bdf2d76ae408c8" @@ -113,7 +143,7 @@ "@types/range-parser" "*" "@types/send" "*" -"@types/express@*", "@types/express@^4.17.13": +"@types/express@*": version "4.17.20" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.20.tgz#e7c9b40276d29e38a4e3564d7a3d65911e2aa433" integrity sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw== @@ -123,6 +153,16 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/express@^4.17.21": + version "4.17.21" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" + integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.33" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/http-errors@*": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.3.tgz#c54e61f79b3947d040f150abd58f71efb422ff62" @@ -150,6 +190,13 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.4.tgz#a4ed836e069491414bab92c31fdea9e557aca0d9" integrity sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw== +"@types/node-forge@^1.3.0": + version "1.3.11" + resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da" + integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ== + dependencies: + "@types/node" "*" + "@types/node@*": version "20.8.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.7.tgz#ad23827850843de973096edfc5abc9e922492a25" @@ -167,10 +214,10 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.6.tgz#7cb33992049fd7340d5b10c0098e104184dfcd2a" integrity sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA== -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== +"@types/retry@0.12.2": + version "0.12.2" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a" + integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow== "@types/send@*": version "0.17.3" @@ -180,14 +227,14 @@ "@types/mime" "^1" "@types/node" "*" -"@types/serve-index@^1.9.1": - version "1.9.3" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.3.tgz#af9403916eb6fbf7d6ec6f47b2a4c46eb3222cc9" - integrity sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg== +"@types/serve-index@^1.9.4": + version "1.9.4" + resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898" + integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug== dependencies: "@types/express" "*" -"@types/serve-static@*", "@types/serve-static@^1.13.10": +"@types/serve-static@*": version "1.15.4" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.4.tgz#44b5895a68ca637f06c229119e1c774ca88f81b2" integrity sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw== @@ -196,24 +243,33 @@ "@types/mime" "*" "@types/node" "*" -"@types/sockjs@^0.3.33": - version "0.3.35" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.35.tgz#f4a568c73d2a8071944bd6ffdca0d4e66810cd21" - integrity sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw== +"@types/serve-static@^1.15.5": + version "1.15.7" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714" + integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw== dependencies: + "@types/http-errors" "*" "@types/node" "*" + "@types/send" "*" -"@types/ws@^8.5.1": - version "8.5.8" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.8.tgz#13efec7bd439d0bdf2af93030804a94f163b1430" - integrity sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg== +"@types/sockjs@^0.3.36": + version "0.3.36" + resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535" + integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q== dependencies: "@types/node" "*" -"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" - integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== +"@types/ws@^8.5.10": + version "8.5.10" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787" + integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A== + dependencies: + "@types/node" "*" + +"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" + integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== dependencies: "@webassemblyjs/helper-numbers" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" @@ -228,10 +284,10 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== -"@webassemblyjs/helper-buffer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" - integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== +"@webassemblyjs/helper-buffer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6" + integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw== "@webassemblyjs/helper-numbers@1.11.6": version "1.11.6" @@ -247,15 +303,15 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== -"@webassemblyjs/helper-wasm-section@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" - integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== +"@webassemblyjs/helper-wasm-section@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf" + integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-gen" "1.12.1" "@webassemblyjs/ieee754@1.11.6": version "1.11.6" @@ -276,72 +332,72 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== -"@webassemblyjs/wasm-edit@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" - integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== +"@webassemblyjs/wasm-edit@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" + integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/helper-wasm-section" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-opt" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" - "@webassemblyjs/wast-printer" "1.11.6" - -"@webassemblyjs/wasm-gen@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" - integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== - dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-opt" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" + "@webassemblyjs/wast-printer" "1.12.1" + +"@webassemblyjs/wasm-gen@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547" + integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w== + dependencies: + "@webassemblyjs/ast" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/ieee754" "1.11.6" "@webassemblyjs/leb128" "1.11.6" "@webassemblyjs/utf8" "1.11.6" -"@webassemblyjs/wasm-opt@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" - integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== +"@webassemblyjs/wasm-opt@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5" + integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" -"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" - integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== +"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" + integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/ast" "1.12.1" "@webassemblyjs/helper-api-error" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/ieee754" "1.11.6" "@webassemblyjs/leb128" "1.11.6" "@webassemblyjs/utf8" "1.11.6" -"@webassemblyjs/wast-printer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" - integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== +"@webassemblyjs/wast-printer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac" + integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA== dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/ast" "1.12.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^2.1.0": +"@webpack-cli/configtest@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^2.0.1": +"@webpack-cli/info@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^2.0.3": +"@webpack-cli/serve@^2.0.5": version "2.0.5" resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== @@ -356,11 +412,6 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -369,7 +420,7 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acorn-import-assertions@^1.7.6: +acorn-import-assertions@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== @@ -433,6 +484,11 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" @@ -440,6 +496,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -458,11 +519,6 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -496,24 +552,14 @@ body-parser@1.20.1: type-is "~1.6.18" unpipe "1.0.0" -bonjour-service@^1.0.11: - version "1.1.1" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" - integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== +bonjour-service@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02" + integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw== dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" fast-deep-equal "^3.1.3" multicast-dns "^7.2.5" -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - brace-expansion@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" @@ -533,14 +579,14 @@ browser-stdout@1.3.1: resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.14.5: - version "4.22.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" - integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== +browserslist@^4.21.10: + version "4.23.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" + integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== dependencies: - caniuse-lite "^1.0.30001541" - electron-to-chromium "^1.4.535" - node-releases "^2.0.13" + caniuse-lite "^1.0.30001587" + electron-to-chromium "^1.4.668" + node-releases "^2.0.14" update-browserslist-db "^1.0.13" buffer-from@^1.0.0: @@ -548,6 +594,13 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== +bundle-name@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889" + integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q== + dependencies: + run-applescript "^7.0.0" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -572,10 +625,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001541: - version "1.0.30001551" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz#1f2cfa8820bd97c971a57349d7fd8f6e08664a3e" - integrity sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg== +caniuse-lite@^1.0.30001587: + version "1.0.30001612" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz#d34248b4ec1f117b70b24ad9ee04c90e0b8a14ae" + integrity sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g== chalk@^4.1.0: version "4.1.2" @@ -585,7 +638,7 @@ chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chokidar@3.5.3, chokidar@^3.5.3: +chokidar@3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -600,6 +653,21 @@ chokidar@3.5.3, chokidar@^3.5.3: optionalDependencies: fsevents "~2.3.2" +chokidar@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" @@ -670,11 +738,6 @@ compression@^1.7.4: safe-buffer "5.1.2" vary "~1.1.2" -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - connect-history-api-fallback@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" @@ -707,7 +770,7 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -735,6 +798,19 @@ decamelize@^4.0.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== +default-browser-id@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26" + integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA== + +default-browser@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf" + integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg== + dependencies: + bundle-name "^4.1.0" + default-browser-id "^5.0.0" + default-gateway@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" @@ -751,10 +827,10 @@ define-data-property@^1.1.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== depd@2.0.0: version "2.0.0" @@ -781,11 +857,6 @@ diff@5.0.0: resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== - dns-packet@^5.2.2: version "5.6.1" resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f" @@ -793,30 +864,40 @@ dns-packet@^5.2.2: dependencies: "@leichtgewicht/ip-codec" "^2.0.1" +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.535: - version "1.4.563" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.563.tgz#dabb424202754c1fed2d2938ff564b23d3bbf0d3" - integrity sha512-dg5gj5qOgfZNkPNeyKBZQAQitIQ/xwfIDmEQJHCbXaD9ebTZxwJXUsDYcBlAvZGZLi+/354l35J1wkmP6CqYaw== +electron-to-chromium@^1.4.668: + version "1.4.745" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.745.tgz#9c202ce9cbf18a5b5e0ca47145fd127cc4dd2290" + integrity sha512-tRbzkaRI5gbUn5DEvF0dV4TQbMZ5CLkWeTAXmpC9IrYT+GE+x76i9p+o3RJ5l9XmdQlI1pPhVtE9uNcJJ0G0EA== emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -enhanced-resolve@^5.13.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" - integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== +enhanced-resolve@^5.16.0: + version "5.16.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787" + integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -1006,6 +1087,14 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + format-util@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271" @@ -1021,11 +1110,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -fs-monkey@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788" - integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew== - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1073,29 +1157,27 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== +glob@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.4" + minimatch "^5.0.1" once "^1.3.0" - path-is-absolute "^1.0.0" -glob@^7.1.3: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== +glob@^10.3.7: + version "10.3.12" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" + integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" + foreground-child "^3.1.0" + jackspeak "^2.3.6" + minimatch "^9.0.1" + minipass "^7.0.4" + path-scurry "^1.10.2" gopd@^1.0.1: version "1.0.1" @@ -1104,7 +1186,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -1158,10 +1240,10 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -html-entities@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061" - integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ== +html-entities@^2.4.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" + integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== http-deceiver@^1.2.7: version "1.2.7" @@ -1269,10 +1351,10 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -ipaddr.js@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f" - integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ== +ipaddr.js@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8" + integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA== is-binary-path@~2.1.0: version "2.1.0" @@ -1288,10 +1370,10 @@ is-core-module@^2.13.0: dependencies: hasown "^2.0.0" -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== is-extglob@^2.1.1: version "2.1.1" @@ -1310,6 +1392,18 @@ is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + +is-network-error@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.1.0.tgz#d26a760e3770226d11c169052f266a4803d9c997" + integrity sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g== + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -1342,12 +1436,12 @@ is-unicode-supported@^0.1.0: resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== +is-wsl@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" + integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw== dependencies: - is-docker "^2.0.0" + is-inside-container "^1.0.0" isarray@~1.0.0: version "1.0.0" @@ -1364,6 +1458,15 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== +jackspeak@^2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" @@ -1400,7 +1503,7 @@ 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== -launch-editor@^2.6.0: +launch-editor@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c" integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw== @@ -1435,17 +1538,22 @@ log-symbols@4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" +lru-cache@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" + integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== -memfs@^3.4.3: - version "3.6.0" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6" - integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ== +memfs@^4.6.0: + version "4.8.2" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.8.2.tgz#9bb7c3e43647348451082557f05fb170b7442949" + integrity sha512-j4WKth315edViMBGkHW6NTF0QBjsTrcRDmYNcGsPq+ozMEyCCCIlX2d2mJ5wuh6iHvJ3FevUrr48v58YRqVdYg== dependencies: - fs-monkey "^1.0.4" + tslib "^2.0.0" merge-descriptors@1.0.1: version "1.0.1" @@ -1504,17 +1612,29 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.4, minimatch@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + +minimatch@^9.0.1: + version "9.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" + integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== dependencies: - brace-expansion "^1.1.7" + brace-expansion "^2.0.1" -mocha@10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" - integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4: + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + +mocha@10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.3.0.tgz#0e185c49e6dccf582035c05fa91084a4ff6e3fe9" + integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== dependencies: ansi-colors "4.1.1" browser-stdout "1.3.1" @@ -1523,13 +1643,12 @@ mocha@10.2.0: diff "5.0.0" escape-string-regexp "4.0.0" find-up "5.0.0" - glob "7.2.0" + glob "8.1.0" he "1.2.0" js-yaml "4.1.0" log-symbols "4.1.0" minimatch "5.0.1" ms "2.1.3" - nanoid "3.3.3" serialize-javascript "6.0.0" strip-json-comments "3.1.1" supports-color "8.1.1" @@ -1561,11 +1680,6 @@ multicast-dns@^7.2.5: dns-packet "^5.2.2" thunky "^1.0.2" -nanoid@3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - negotiator@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -1581,10 +1695,10 @@ node-forge@^1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== -node-releases@^2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" - integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== +node-releases@^2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" + integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -1608,7 +1722,7 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@2.4.1: +on-finished@2.4.1, on-finished@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== @@ -1634,14 +1748,15 @@ onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^8.0.9: - version "8.4.2" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" - integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== +open@^10.0.3: + version "10.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1" + integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw== dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" + default-browser "^5.2.1" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^3.1.0" p-limit@^2.2.0: version "2.3.0" @@ -1671,12 +1786,13 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-retry@^4.5.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== +p-retry@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd" + integrity sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA== dependencies: - "@types/retry" "0.12.0" + "@types/retry" "0.12.2" + is-network-error "^1.0.0" retry "^0.13.1" p-try@^2.0.0: @@ -1694,11 +1810,6 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" @@ -1709,6 +1820,14 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +path-scurry@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" + integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== + dependencies: + lru-cache "^10.2.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -1855,12 +1974,17 @@ retry@^0.13.1: resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== +rimraf@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf" + integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A== dependencies: - glob "^7.1.3" + glob "^10.3.7" + +run-applescript@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb" + integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A== safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" @@ -1877,7 +2001,7 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -schema-utils@^3.1.1, schema-utils@^3.1.2: +schema-utils@^3.1.1, schema-utils@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== @@ -1886,7 +2010,7 @@ schema-utils@^3.1.1, schema-utils@^3.1.2: ajv "^6.12.5" ajv-keywords "^3.5.2" -schema-utils@^4.0.0: +schema-utils@^4.0.0, schema-utils@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== @@ -1901,11 +2025,12 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== -selfsigned@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== +selfsigned@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0" + integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q== dependencies: + "@types/node-forge" "^1.3.0" node-forge "^1" send@0.18.0: @@ -2022,6 +2147,11 @@ signal-exit@^3.0.3: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + sockjs@^0.3.24: version "0.3.24" resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" @@ -2036,12 +2166,11 @@ source-map-js@^1.0.2: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-loader@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-4.0.1.tgz#72f00d05f5d1f90f80974eda781cbd7107c125f2" - integrity sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA== +source-map-loader@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-5.0.0.tgz#f593a916e1cc54471cfc8851b905c8a845fc7e38" + integrity sha512-k2Dur7CbSLcAH73sBcIkV5xjPV4SzqO1NJ7+XaQl8if3VODDUj3FNchNGpqgJSKbvUfJuhVdv8K2Eu8/TNl2eA== dependencies: - abab "^2.0.6" iconv-lite "^0.6.3" source-map-js "^1.0.2" @@ -2091,7 +2220,7 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== -string-width@^4.1.0, string-width@^4.2.0: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -2100,6 +2229,15 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -2114,13 +2252,20 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + strip-final-newline@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" @@ -2155,21 +2300,21 @@ tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -terser-webpack-plugin@^5.3.7: - version "5.3.9" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" - integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== +terser-webpack-plugin@^5.3.10: + version "5.3.10" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" + integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== dependencies: - "@jridgewell/trace-mapping" "^0.3.17" + "@jridgewell/trace-mapping" "^0.3.20" jest-worker "^27.4.5" schema-utils "^3.1.1" serialize-javascript "^6.0.1" - terser "^5.16.8" + terser "^5.26.0" -terser@^5.16.8: - version "5.22.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.22.0.tgz#4f18103f84c5c9437aafb7a14918273310a8a49d" - integrity sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw== +terser@^5.26.0: + version "5.30.3" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.3.tgz#f1bb68ded42408c316b548e3ec2526d7dd03f4d2" + integrity sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -2193,6 +2338,11 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +tslib@^2.0.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -2201,10 +2351,10 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typescript@5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" - integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== +typescript@5.4.3: + version "5.4.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff" + integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg== undici-types@~5.25.1: version "5.25.3" @@ -2251,10 +2401,10 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== +watchpack@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff" + integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -2266,15 +2416,15 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" -webpack-cli@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.0.tgz#abc4b1f44b50250f2632d8b8b536cfe2f6257891" - integrity sha512-a7KRJnCxejFoDpYTOwzm5o21ZXMaNqtRlvS183XzGDUPRdVEzJNImcQokqYZ8BNTnk9DkKiuWxw75+DCCoZ26w== +webpack-cli@5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.1.0" - "@webpack-cli/info" "^2.0.1" - "@webpack-cli/serve" "^2.0.3" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" commander "^10.0.1" cross-spawn "^7.0.3" @@ -2285,52 +2435,53 @@ webpack-cli@5.1.0: rechoir "^0.8.0" webpack-merge "^5.7.3" -webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== +webpack-dev-middleware@^7.1.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-7.2.1.tgz#2af00538b6e4eda05f5afdd5d711dbebc05958f7" + integrity sha512-hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA== dependencies: colorette "^2.0.10" - memfs "^3.4.3" + memfs "^4.6.0" mime-types "^2.1.31" + on-finished "^2.4.1" range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@4.15.0: - version "4.15.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz#87ba9006eca53c551607ea0d663f4ae88be7af21" - integrity sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" +webpack-dev-server@5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz#cb6ea47ff796b9251ec49a94f24a425e12e3c9b8" + integrity sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA== + dependencies: + "@types/bonjour" "^3.5.13" + "@types/connect-history-api-fallback" "^1.5.4" + "@types/express" "^4.17.21" + "@types/serve-index" "^1.9.4" + "@types/serve-static" "^1.15.5" + "@types/sockjs" "^0.3.36" + "@types/ws" "^8.5.10" ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" + bonjour-service "^1.2.1" + chokidar "^3.6.0" colorette "^2.0.10" compression "^1.7.4" connect-history-api-fallback "^2.0.0" default-gateway "^6.0.3" express "^4.17.3" graceful-fs "^4.2.6" - html-entities "^2.3.2" + html-entities "^2.4.0" http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - launch-editor "^2.6.0" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.1.1" + ipaddr.js "^2.1.0" + launch-editor "^2.6.1" + open "^10.0.3" + p-retry "^6.2.0" + rimraf "^5.0.5" + schema-utils "^4.2.0" + selfsigned "^2.4.1" serve-index "^1.9.1" sockjs "^0.3.24" spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.13.0" + webpack-dev-middleware "^7.1.0" + ws "^8.16.0" webpack-merge@^5.7.3: version "5.10.0" @@ -2346,34 +2497,34 @@ 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.82.0: - version "5.82.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.82.0.tgz#3c0d074dec79401db026b4ba0fb23d6333f88e7d" - integrity sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg== +webpack@5.91.0: + version "5.91.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9" + integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw== dependencies: "@types/eslint-scope" "^3.7.3" - "@types/estree" "^1.0.0" - "@webassemblyjs/ast" "^1.11.5" - "@webassemblyjs/wasm-edit" "^1.11.5" - "@webassemblyjs/wasm-parser" "^1.11.5" + "@types/estree" "^1.0.5" + "@webassemblyjs/ast" "^1.12.1" + "@webassemblyjs/wasm-edit" "^1.12.1" + "@webassemblyjs/wasm-parser" "^1.12.1" acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" + acorn-import-assertions "^1.9.0" + browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.13.0" + enhanced-resolve "^5.16.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" + graceful-fs "^4.2.11" json-parse-even-better-errors "^2.3.1" loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.2" + schema-utils "^3.2.0" tapable "^2.1.1" - terser-webpack-plugin "^5.3.7" - watchpack "^2.4.0" + terser-webpack-plugin "^5.3.10" + watchpack "^2.4.1" webpack-sources "^3.2.3" websocket-driver@>=0.5.1, websocket-driver@^0.7.4: @@ -2407,7 +2558,7 @@ workerpool@6.2.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -2416,15 +2567,24 @@ wrap-ansi@^7.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^8.13.0: - version "8.14.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f" - integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g== +ws@^8.16.0: + version "8.16.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" + integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== y18n@^5.0.5: version "5.0.8" diff --git a/checks/kmp/dependencies/classpath.txt b/checks/kmp/dependencies/classpath.txt index b642c790..365466a7 100644 --- a/checks/kmp/dependencies/classpath.txt +++ b/checks/kmp/dependencies/classpath.txt @@ -149,35 +149,30 @@ org.glassfish.jaxb:jaxb-runtime:2.3.2 org.glassfish.jaxb:txw2:2.3.2 org.jdom:jdom2:2.0.6 org.jetbrains.intellij.deps:trove4j:1.0.20200330 -org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.9.23 -org.jetbrains.kotlin:kotlin-android-extensions:1.9.23 -org.jetbrains.kotlin:kotlin-build-tools-api:1.9.23 -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-compiler-runner:1.9.23 -org.jetbrains.kotlin:kotlin-daemon-client:1.9.23 -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.23 -org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.23 -org.jetbrains.kotlin:kotlin-native-utils:1.9.23 -org.jetbrains.kotlin:kotlin-project-model:1.9.23 +org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-build-statistics:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-build-tools-api:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-compiler-runner:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-daemon-client:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-native-utils:2.0.0-RC2 org.jetbrains.kotlin:kotlin-reflect:1.9.22 -org.jetbrains.kotlin:kotlin-script-runtime:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-common:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.23 +org.jetbrains.kotlin:kotlin-script-runtime:2.0.0-RC2 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -org.jetbrains.kotlin:kotlin-tooling-core:1.9.23 -org.jetbrains.kotlin:kotlin-util-io:1.9.23 -org.jetbrains.kotlin:kotlin-util-klib:1.9.23 +org.jetbrains.kotlin:kotlin-tooling-core:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-util-io:2.0.0-RC2 +org.jetbrains.kotlin:kotlin-util-klib:2.0.0-RC2 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0 org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1 diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index 91d6fff4..83c18ea8 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -18,6 +18,7 @@ com.fasterxml.jackson:jackson-bom:2.12.7 com.fasterxml.woodstox:woodstox-core:6.2.4 com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.51.0 com.github.ben-manes:gradle-versions-plugin:0.51.0 +com.google.code.gson:gson:2.8.9 com.googlecode.concurrent-trees:concurrent-trees:2.6.1 com.googlecode.javaewah:JavaEWAH:1.2.3 com.gradle.plugin-publish:com.gradle.plugin-publish.gradle.plugin:1.2.1 @@ -59,40 +60,35 @@ org.jetbrains.dokka:dokka-core:1.9.20 org.jetbrains.dokka:dokka-gradle-plugin:1.9.20 org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.20 org.jetbrains.intellij.deps:trove4j:1.0.20200330 -org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.23 -org.jetbrains.kotlin.plugin.sam.with.receiver:org.jetbrains.kotlin.plugin.sam.with.receiver.gradle.plugin:1.9.23 -org.jetbrains.kotlin:kotlin-android-extensions:1.9.23 -org.jetbrains.kotlin:kotlin-build-tools-api:1.9.23 -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-compiler-runner:1.9.23 -org.jetbrains.kotlin:kotlin-daemon-client:1.9.23 -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.23 -org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.23 -org.jetbrains.kotlin:kotlin-native-utils:1.9.23 -org.jetbrains.kotlin:kotlin-project-model:1.9.23 +org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.0.0-RC3 +org.jetbrains.kotlin.plugin.sam.with.receiver:org.jetbrains.kotlin.plugin.sam.with.receiver.gradle.plugin:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-build-statistics:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-build-tools-api:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-compiler-runner:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-daemon-client:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-native-utils:2.0.0-RC3 org.jetbrains.kotlin:kotlin-reflect:1.9.22 -org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.23 -org.jetbrains.kotlin:kotlin-script-runtime:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-common:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.23 +org.jetbrains.kotlin:kotlin-sam-with-receiver:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-script-runtime:2.0.0-RC3 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -org.jetbrains.kotlin:kotlin-tooling-core:1.9.23 -org.jetbrains.kotlin:kotlin-util-io:1.9.23 -org.jetbrains.kotlin:kotlin-util-klib:1.9.23 -org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.14.0 -org.jetbrains.kotlinx:binary-compatibility-validator:0.14.0 +org.jetbrains.kotlin:kotlin-tooling-core:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-util-io:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-util-klib:2.0.0-RC3 +org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.15.0-Beta.2 +org.jetbrains.kotlinx:binary-compatibility-validator:0.15.0-Beta.2 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/fluxo-kmp-conf/build.gradle.kts b/fluxo-kmp-conf/build.gradle.kts index 8315a3db..4dc23b08 100644 --- a/fluxo-kmp-conf/build.gradle.kts +++ b/fluxo-kmp-conf/build.gradle.kts @@ -51,7 +51,7 @@ fkcSetupGradlePlugin( // Check shrinking possibilities with `R8(full)` chain, // but don't replace the outgoing jar. replaceOutgoingJar = false - shrink { fullMode = true } + // shrink { fullMode = true } publicationConfig { developerId = "amal" @@ -62,6 +62,7 @@ fkcSetupGradlePlugin( apiValidation { nonPublicMarkers.add("fluxo.annotation.InternalFluxoApi") } + enableApiValidation = false } // Exclude Kotlin stdlib from the implementation classpath entirely diff --git a/fluxo-kmp-conf/dependencies/compileClasspath.txt b/fluxo-kmp-conf/dependencies/compileClasspath.txt index 44e57755..d72b9632 100644 --- a/fluxo-kmp-conf/dependencies/compileClasspath.txt +++ b/fluxo-kmp-conf/dependencies/compileClasspath.txt @@ -21,10 +21,10 @@ com.github.ben-manes:gradle-versions-plugin:0.51.0 com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:5.3.5 com.github.gmazzo.buildconfig:plugin:5.3.5 com.google.code.findbugs:jsr305:3.0.2 -com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.23-1.0.20 +com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.0-RC3-1.0.20 com.google.errorprone:error_prone_annotations:2.26.1 com.google.guava:failureaccess:1.0.2 -com.google.guava:guava:33.1.0-jre +com.google.guava:guava:33.2.0-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:3.0.0 com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.16.2 @@ -36,8 +36,8 @@ com.guardsquare:proguard-core:9.1.3 com.guardsquare:proguard-gradle:7.4.2 com.louiscad.complete-kotlin:com.louiscad.complete-kotlin.gradle.plugin:1.1.0 com.louiscad.complete-kotlin:plugin:1.1.0 -com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:11.1.4 -com.mikepenz.aboutlibraries.plugin:com.mikepenz.aboutlibraries.plugin.gradle.plugin:11.1.4 +com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:11.2.0-a01 +com.mikepenz.aboutlibraries.plugin:com.mikepenz.aboutlibraries.plugin.gradle.plugin:11.2.0-a01 com.pinterest.ktlint:ktlint-cli:1.2.1 com.savvasdalkitsis.module-dependency-graph:com.savvasdalkitsis.module-dependency-graph.gradle.plugin:0.12 com.savvasdalkitsis:module-dependency-graph:0.12 @@ -64,26 +64,25 @@ org.apache.maven:maven-model:3.6.3 org.barfuin.gradle.taskinfo:gradle-taskinfo:2.2.0 org.barfuin.gradle.taskinfo:org.barfuin.gradle.taskinfo.gradle.plugin:2.2.0 org.checkerframework:checker-qual:3.42.0 -org.jetbrains.compose:compose-gradle-plugin:1.6.2 +org.jetbrains.compose:compose-gradle-plugin:1.6.10-rc03 org.jetbrains.dokka:dokka-core:1.9.20 org.jetbrains.dokka:dokka-gradle-plugin:1.9.20 org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.20 org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.17.3 -org.jetbrains.kotlin.plugin.sam.with.receiver:org.jetbrains.kotlin.plugin.sam.with.receiver.gradle.plugin:1.9.23 +org.jetbrains.kotlin.plugin.sam.with.receiver:org.jetbrains.kotlin.plugin.sam.with.receiver.gradle.plugin:2.0.0-RC3 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23 -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.23 +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.0-RC3 org.jetbrains.kotlin:kotlin-metadata-jvm:2.0.0-RC1 -org.jetbrains.kotlin:kotlin-native-utils:1.9.23 -org.jetbrains.kotlin:kotlin-project-model:1.9.23 -org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.23 -org.jetbrains.kotlin:kotlin-tooling-core:1.9.23 -org.jetbrains.kotlin:kotlin-util-io:1.9.23 -org.jetbrains.kotlin:kotlin-util-klib:1.9.23 -org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.14.0 -org.jetbrains.kotlinx:binary-compatibility-validator:0.14.0 +org.jetbrains.kotlin:kotlin-native-utils:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-sam-with-receiver:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-tooling-core:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-util-io:2.0.0-RC3 +org.jetbrains.kotlin:kotlin-util-klib:2.0.0-RC3 +org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.15.0-Beta.2 +org.jetbrains.kotlinx:binary-compatibility-validator:0.15.0-Beta.2 org.ow2.asm:asm:9.7 org.tomlj:tomlj:1.1.1 diff --git a/fluxo-kmp-conf/detekt-baseline.xml b/fluxo-kmp-conf/detekt-baseline.xml index 099226ae..65047b1f 100644 --- a/fluxo-kmp-conf/detekt-baseline.xml +++ b/fluxo-kmp-conf/detekt-baseline.xml @@ -17,7 +17,6 @@ ForbiddenComment:AbstractShrinkerTask.kt$AbstractShrinkerTask$// TODO: Shared obfuscation dictionaries ForbiddenComment:AndroidTarget.kt$AndroidTarget$// FIXME: Implement API for source sets. ForbiddenComment:AndroidTarget.kt$AndroidTarget.Configure$// TODO: Detect applied plugin (lib/app) and use appropriate container? - ForbiddenComment:AppleIosTarget.kt$// FIXME: Public hierarchy of targets for easier configuration ForbiddenComment:ContainerImpl.kt$ContainerImpl$// TODO: Utilize version available from PluginDependency ForbiddenComment:DependencyAnalysisPlugin.kt$// TODO: no need to declare transitive dependencies for the final app module ForbiddenComment:DependencyGuardPlugin.kt$// TODO: Allow to customize configurations auto-filtration @@ -39,12 +38,10 @@ ForbiddenComment:FluxoKmpConfPlugin.kt$FluxoKmpConfPlugin$// TODO: Support version catalog declarations if available ForbiddenComment:FluxoPublicationConfig.kt$// TODO: Make an immutable resulting class ForbiddenComment:GetSetOfRequestedKmpTargets.kt$// TODO: Support "metadata_only"/metadataOnly mode (see arkivanov/gradle-setup-plugin) - ForbiddenComment:KmpHierarchyTemplate.kt$// TODO: commonWasm group for wasmWasi and wasmJs ForbiddenComment:KmpTargetContainer.kt$KmpTargetContainer$// TODO: Create common bundle once and reuse? ForbiddenComment:KotlinConfigSetup.kt$// TODO: Add env flag for dynamic switch-on when needed ForbiddenComment:KotlinConfigSetup.kt$// TODO: Auto detect if `-Xjdk-release` actually can be used. ForbiddenComment:KotlinConfigSetup.kt$// TODO: Detect if JVM toolchains are already enabled in the project. - ForbiddenComment:KotlinJsUtils.kt$// TODO: Uncomment once compiled for Kotlin 2.0 ForbiddenComment:KotlinSetupDiagnosticTasks.kt$// TODO: @DisableCachingByDefault(because = "Not worth caching") ForbiddenComment:KotlinSourceSetsReportTask.kt$// TODO: Mark source sets with deprectaed or 3rd tier targets ForbiddenComment:LoadAndApplyPluginIfNotApplied.kt$// TODO: Check version for correctness diff --git a/fluxo-kmp-conf/src/main/kotlin/DependencyUtils.kt b/fluxo-kmp-conf/src/main/kotlin/DependencyUtils.kt index 93ae10f0..dd92e22a 100644 --- a/fluxo-kmp-conf/src/main/kotlin/DependencyUtils.kt +++ b/fluxo-kmp-conf/src/main/kotlin/DependencyUtils.kt @@ -9,7 +9,6 @@ import org.gradle.api.provider.Provider import org.gradle.plugin.use.PluginDependency import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet.Companion.COMMON_MAIN_SOURCE_SET_NAME -import org.jetbrains.kotlin.gradle.plugin.mpp.DefaultKotlinDependencyHandler /** * Converts a [PluginDependency] to a usual module dependency @@ -45,7 +44,9 @@ public fun KotlinDependencyHandler.ksp(dependencyNotation: Any): Dependency? { // instead of writing the ksp("dep") // use ksp() or add(ksp). // https://kotlinlang.org/docs/ksp-multiplatform.html - val parent = (this as DefaultKotlinDependencyHandler).parent + @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") + val parent = (this as org.jetbrains.kotlin.gradle.plugin.mpp.DefaultKotlinDependencyHandler) + .parent var confName = parent.compileOnlyConfigurationName .replace(COMPILE_ONLY, "", ignoreCase = true) if (confName.startsWith(COMMON_MAIN_SOURCE_SET_NAME, ignoreCase = true)) { diff --git a/fluxo-kmp-conf/src/main/kotlin/KmpHierarchyTemplate.kt b/fluxo-kmp-conf/src/main/kotlin/KmpHierarchyTemplate.kt index 94bd7365..5f0c7661 100644 --- a/fluxo-kmp-conf/src/main/kotlin/KmpHierarchyTemplate.kt +++ b/fluxo-kmp-conf/src/main/kotlin/KmpHierarchyTemplate.kt @@ -19,8 +19,10 @@ public val KotlinHierarchyTemplate.Templates.fluxoKmpConf: KotlinHierarchyBuilde group("nonJvm") { group("commonJs") { withJs() - withWasm() - // TODO: commonWasm group for wasmWasi and wasmJs + group("commonWasm") { + withWasmJs() + withWasmWasi() + } } group("native") } diff --git a/fluxo-kmp-conf/src/main/kotlin/KotlinJsUtils.kt b/fluxo-kmp-conf/src/main/kotlin/KotlinJsUtils.kt index 2bb4c24d..9ef2d5c3 100644 --- a/fluxo-kmp-conf/src/main/kotlin/KotlinJsUtils.kt +++ b/fluxo-kmp-conf/src/main/kotlin/KotlinJsUtils.kt @@ -2,6 +2,12 @@ @file:JvmMultifileClass import fluxo.conf.dsl.container.KotlinTargetContainer +import fluxo.conf.impl.kotlin.KOTLIN_2_0 +import fluxo.log.w +import org.gradle.api.Action +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi +import org.jetbrains.kotlin.gradle.dsl.JsModuleKind +import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl @@ -22,17 +28,36 @@ public val DEFAULT_COMMON_JS_CONF: KotlinTarget.() -> Unit = { testTimeout() } + @OptIn(ExperimentalKotlinGradlePluginApi::class) + try { + compilerOptions(JsConfAction) + } catch (_: Throwable) { + } + compilations.configureEach { - kotlinOptions { - moduleKind = "es" - sourceMap = true - metaInfo = true + // Fallback for older Kotlin versions + try { + @Suppress("DEPRECATION") + kotlinOptions { + moduleKind = "es" + sourceMap = true + try { + useEsClasses = true + } catch (_: Error) { + } + } + } catch (_: Throwable) { + } + + compileTaskProvider.configure { try { - useEsClasses = true - } catch (_: Error) { + compilerOptions(JsConfAction) + } catch (e: Throwable) { + logger.w("Failed to set up JS compilerOptions: $e", e) } } } + try { useEsModules() } catch (_: Error) { @@ -56,23 +81,36 @@ public val DEFAULT_COMMON_JS_CONF: KotlinTarget.() -> Unit = { testTimeout() } } - // Apply Binaryen optimizer to the WASM target - applyBinaryen() + // Apply Binaryen optimizer to the WASM target. + if (KotlinVersion.CURRENT < KOTLIN_2_0) { + // Binaryen is enabled by default in Kotlin 2.0. + @Suppress("DEPRECATION") + applyBinaryen() + } } else { + // KotlinWasmTargetDsl is incomplete before Kotlin 2.0 try { - @Suppress("ControlFlowWithEmptyBody") if (this is KotlinWasmTargetDsl) { - // TODO: Uncomment once compiled for Kotlin 2.0 - // Apply Binaryen optimizer to the WASM target -// applyBinaryen() -// -// binaries.executable() + // Binaryen is enabled by default in Kotlin 2.0. + // applyBinaryen() + binaries.executable() } } catch (_: Error) { } } } +private object JsConfAction : Action { + override fun execute(o: KotlinJsCompilerOptions) { + o.moduleKind.set(JsModuleKind.MODULE_ES) + o.sourceMap.set(true) + try { + o.useEsClasses.set(true) + } catch (_: Error) { + } + } +} + public fun KotlinJsSubTargetDsl.testTimeout(seconds: Int = TEST_TIMEOUT) { require(seconds > 0) { "Timeout seconds must be greater than 0." } testTask { diff --git a/fluxo-kmp-conf/src/main/kotlin/MultiplatformSourceSetUtils.kt b/fluxo-kmp-conf/src/main/kotlin/MultiplatformSourceSetUtils.kt index a54d408f..203c88d1 100644 --- a/fluxo-kmp-conf/src/main/kotlin/MultiplatformSourceSetUtils.kt +++ b/fluxo-kmp-conf/src/main/kotlin/MultiplatformSourceSetUtils.kt @@ -2,7 +2,6 @@ @file:JvmName("Fkc") @file:JvmMultifileClass -import fluxo.conf.dsl.container.impl.KmpTargetCode import fluxo.conf.dsl.container.impl.KmpTargetContainerImpl import fluxo.conf.dsl.container.impl.KmpTargetContainerImpl.CommonJvm.Companion.ANDROID import fluxo.conf.impl.compileOnlyAndLog @@ -21,7 +20,6 @@ import org.gradle.api.NamedDomainObjectCollection import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.Project import org.gradle.api.artifacts.Dependency -import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet @@ -111,12 +109,6 @@ public val KotlinSourceSetContainer.commonLinux: SourceSetBundle public val KotlinSourceSetContainer.commonMingw: SourceSetBundle get() = sourceSets.bundle(KmpTargetContainerImpl.NonJvm.Native.Mingw.MINGW) -/** Parent [SourceSetBundle] for all WASM/Native targets */ -@Deprecated(KmpTargetCode.DEPRECATED_TARGET_MSG) -@Suppress("DeprecatedCallableAddReplaceWith") -public val KotlinSourceSetContainer.commonWasmNative: SourceSetBundle - get() = sourceSets.bundle(KmpTargetContainerImpl.NonJvm.Native.WasmNative.WASM_NATIVE) - // endregion @@ -170,10 +162,6 @@ public val E.androidNativeSet: Set where E : KotlinSourceSetContainer, E : KotlinTargetsContainer get() = nativeSourceSets(Family.ANDROID) -public val E.wasmNativeSet: Set - where E : KotlinSourceSetContainer, E : KotlinTargetsContainer - get() = nativeSourceSets(Family.WASM) - /** All Apple (Darwin) targets */ public val E.appleSet: Set @@ -382,14 +370,9 @@ public fun E.commonCompileOnly( addConstraint: Boolean = true, ) where E : KotlinSourceSetContainer, E : KotlinTargetsContainer { val p = try { - project ?: targets.firstOrNull()?.project ?: when (this) { - is KotlinTopLevelExtension -> { - @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") - this.project - } - - else -> throw NullPointerException("Please, provide project") - } + project + ?: targets.firstOrNull()?.project + ?: throw NullPointerException("Please, provide project") } catch (e: Throwable) { throw GradleException( "Unable to add common compileOnly dependency '$dependencyNotation': $e", diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/KmpConfigurationContainerDsl.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/KmpConfigurationContainerDsl.kt index f0bbe435..577daecc 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/KmpConfigurationContainerDsl.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/KmpConfigurationContainerDsl.kt @@ -8,7 +8,6 @@ import fluxo.conf.dsl.container.target.AppleWatchosTarget import fluxo.conf.dsl.container.target.JsTarget import fluxo.conf.dsl.container.target.LinuxTarget import fluxo.conf.dsl.container.target.MingwTarget -import fluxo.conf.dsl.container.target.WasmNativeTarget import fluxo.conf.dsl.container.target.WasmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension @@ -23,8 +22,7 @@ public interface KmpConfigurationContainerDsl : LinuxTarget.Configure, MingwTarget.Configure, WasmTarget.Configure, - AndroidNativeTarget.Configure, - WasmNativeTarget.Configure { + AndroidNativeTarget.Configure { /** * Executes the given [action] for the KMP module with any target enabled. @@ -37,5 +35,7 @@ public interface KmpConfigurationContainerDsl : * @see org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension.targetHierarchy * @see org.jetbrains.kotlin.gradle.dsl.KotlinTargetHierarchyDsl.default */ - public fun allDefaultTargets() + public fun allDefaultTargets(wasmWasi: Boolean = ENABLE_WASM_WASI) } + +private const val ENABLE_WASM_WASI = false diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/ContainerImpl.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/ContainerImpl.kt index 0586ef16..c8b94e3b 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/ContainerImpl.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/ContainerImpl.kt @@ -73,8 +73,6 @@ internal abstract class ContainerImpl( internal const val MINGW_SORT_ORDER: Byte = 51 - internal const val WASM_NATIVE_SORT_ORDER: Byte = 61 - internal const val CUSTOM_SORT_ORDER: Byte = 101 // endregion diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpConfigurationContainerDslImpl.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpConfigurationContainerDslImpl.kt index 68632615..7827ce0d 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpConfigurationContainerDslImpl.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpConfigurationContainerDslImpl.kt @@ -17,7 +17,6 @@ import fluxo.conf.dsl.container.impl.target.TargetJvmContainer import fluxo.conf.dsl.container.impl.target.TargetLinuxContainer import fluxo.conf.dsl.container.impl.target.TargetMingwContainer import fluxo.conf.dsl.container.impl.target.TargetWasmContainer -import fluxo.conf.dsl.container.impl.target.TargetWasmNativeContainer import fluxo.conf.impl.kotlin.KOTLIN_1_8_20 import fluxo.conf.impl.kotlin.KOTLIN_1_9_20 import fluxo.conf.impl.kotlin.KOTLIN_2_0 @@ -44,8 +43,7 @@ internal class KmpConfigurationContainerDslImpl( TargetLinuxContainer.Configure, TargetMingwContainer.Configure, TargetWasmContainer.Configure, - TargetAndroidNativeContainer.Configure, - TargetWasmNativeContainer.Configure { + TargetAndroidNativeContainer.Configure { override fun > onTarget( type: Class, @@ -84,7 +82,7 @@ internal class KmpConfigurationContainerDslImpl( * @see org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension.targetHierarchy * @see org.jetbrains.kotlin.gradle.dsl.KotlinTargetHierarchyDsl.default */ - override fun allDefaultTargets() { + override fun allDefaultTargets(wasmWasi: Boolean) { // KotlinMultiplatformExtension.targetHierarchy // https://kotlinlang.org/docs/whatsnew1820.html#new-approach-to-source-set-hierarchy @@ -113,7 +111,7 @@ internal class KmpConfigurationContainerDslImpl( // WASI target is available since Kotlin 1.9.20. // Both WASI and JS can be used together since Kotlin 2.0. - if (ENABLE_WASM_WASI && kotlinPluginVersion >= KOTLIN_2_0) { + if (wasmWasi && kotlinPluginVersion >= KOTLIN_2_0) { wasmWasi() } } @@ -135,5 +133,3 @@ internal class KmpConfigurationContainerDslImpl( // https://docs.gradle.org/current/userguide/validation_problems.html#implicit_dependency private fun isGradleNotFailingOnImplicitTaskDependencies() = GradleVersion.current() < GradleVersion.version("8.0") - -private const val ENABLE_WASM_WASI = false diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpTargetCode.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpTargetCode.kt index 1014f90a..cdc9c547 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpTargetCode.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpTargetCode.kt @@ -31,13 +31,9 @@ internal enum class KmpTargetCode { LINUX_X64, LINUX_ARM64, LINUX_ARM32_HFP, - LINUX_MIPS32, - LINUX_MIPSEL32, - MINGW_X86, MINGW_X64, - IOS_ARM32, IOS_ARM64, IOS_X64, IOS_SIMULATOR_ARM64, @@ -50,15 +46,13 @@ internal enum class KmpTargetCode { WATCHOS_ARM64, WATCHOS_DEVICE_ARM64, WATCHOS_SIMULATOR_ARM64, - WATCHOS_X86, WATCHOS_X64, ANDROID_ARM32, ANDROID_ARM64, ANDROID_X86, ANDROID_X64, - - WASM32; + ; internal companion object { @@ -76,7 +70,7 @@ internal enum class KmpTargetCode { internal val COMMON_WASM = arrayOf(WASM_JS, WASM_WASI) internal val COMMON_JS = COMMON_WASM + JS - internal val IOS = arrayOf(IOS_ARM32, IOS_ARM64, IOS_SIMULATOR_ARM64, IOS_X64) + internal val IOS = arrayOf(IOS_ARM64, IOS_SIMULATOR_ARM64, IOS_X64) internal val MACOS = arrayOf(MACOS_ARM64, MACOS_X64) internal val OSX = MACOS internal val TVOS = arrayOf(TVOS_ARM64, TVOS_SIMULATOR_ARM64, TVOS_X64) @@ -86,17 +80,16 @@ internal enum class KmpTargetCode { WATCHOS_DEVICE_ARM64, WATCHOS_SIMULATOR_ARM64, WATCHOS_X64, - WATCHOS_X86, ) internal val APPLE = IOS + MACOS + TVOS + WATCHOS internal val LINUX = - arrayOf(LINUX_X64, LINUX_ARM64, LINUX_ARM32_HFP, LINUX_MIPS32, LINUX_MIPSEL32) - internal val MINGW = arrayOf(MINGW_X64, MINGW_X86) + arrayOf(LINUX_X64, LINUX_ARM64, LINUX_ARM32_HFP) + internal val MINGW = arrayOf(MINGW_X64) internal val UNIX = APPLE + LINUX internal val ANDROID_NATIVE = arrayOf(ANDROID_ARM32, ANDROID_ARM64, ANDROID_X64, ANDROID_X86) - internal val NATIVE = UNIX + MINGW + ANDROID_NATIVE + WASM32 + internal val NATIVE = UNIX + MINGW + ANDROID_NATIVE internal val NON_JVM = COMMON_JS + NATIVE @@ -133,29 +126,23 @@ internal enum class KmpTargetCode { KonanTarget.ANDROID_ARM64 -> ANDROID_ARM64 KonanTarget.ANDROID_X64 -> ANDROID_X64 KonanTarget.ANDROID_X86 -> ANDROID_X86 - KonanTarget.IOS_ARM32 -> IOS_ARM32 KonanTarget.IOS_ARM64 -> IOS_ARM64 KonanTarget.IOS_SIMULATOR_ARM64 -> IOS_SIMULATOR_ARM64 KonanTarget.IOS_X64 -> IOS_X64 KonanTarget.LINUX_ARM32_HFP -> LINUX_ARM32_HFP KonanTarget.LINUX_ARM64 -> LINUX_ARM64 - KonanTarget.LINUX_MIPS32 -> LINUX_MIPS32 - KonanTarget.LINUX_MIPSEL32 -> LINUX_MIPSEL32 KonanTarget.LINUX_X64 -> LINUX_X64 KonanTarget.MACOS_ARM64 -> MACOS_ARM64 KonanTarget.MACOS_X64 -> MACOS_X64 KonanTarget.MINGW_X64 -> MINGW_X64 - KonanTarget.MINGW_X86 -> MINGW_X86 KonanTarget.TVOS_ARM64 -> TVOS_ARM64 KonanTarget.TVOS_SIMULATOR_ARM64 -> TVOS_SIMULATOR_ARM64 KonanTarget.TVOS_X64 -> TVOS_X64 - KonanTarget.WASM32 -> WASM32 KonanTarget.WATCHOS_ARM32 -> WATCHOS_ARM32 KonanTarget.WATCHOS_ARM64 -> WATCHOS_ARM64 KonanTarget.WATCHOS_DEVICE_ARM64 -> WATCHOS_DEVICE_ARM64 KonanTarget.WATCHOS_SIMULATOR_ARM64 -> WATCHOS_SIMULATOR_ARM64 KonanTarget.WATCHOS_X64 -> WATCHOS_X64 - KonanTarget.WATCHOS_X86 -> WATCHOS_X86 else -> { logger?.w("Unexpected KonanTarget: $konanTarget") @@ -173,7 +160,6 @@ internal enum class KmpTargetCode { internal fun fromKotlinFamily(family: Family): Array { return when (family) { - Family.WASM -> arrayOf(WASM32) Family.ANDROID -> ANDROID_NATIVE Family.MINGW -> MINGW Family.LINUX -> LINUX @@ -182,7 +168,7 @@ internal enum class KmpTargetCode { Family.TVOS -> TVOS Family.WATCHOS -> WATCHOS - Family.ZEPHYR -> arrayOf() + else -> arrayOf() } } } diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpTargetContainerImpl.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpTargetContainerImpl.kt index 69e951ac..d5021b64 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpTargetContainerImpl.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/KmpTargetContainerImpl.kt @@ -13,7 +13,6 @@ import commonNonJvm import commonTvos import commonUnix import commonWasm -import commonWasmNative import commonWatchos import dependsOn import fluxo.conf.impl.set @@ -290,24 +289,6 @@ internal abstract class KmpTargetContainerImpl( super.setupParentSourceSet(k, bundle) } } - - interface WasmNative : Native { - companion object { - const val WASM_NATIVE = "wasmNative" - } - - override fun setupParentSourceSet( - k: KotlinMultiplatformExtension, - child: SourceSetBundle, - ) { - if (!allowManualHierarchy) return - @Suppress("DEPRECATION") - val bundle = k.commonWasmNative - @Suppress("DEPRECATION") - child dependsOn bundle - super.setupParentSourceSet(k, bundle) - } - } } } } diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetAppleIosContainer.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetAppleIosContainer.kt index f8b1e402..1b09832c 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetAppleIosContainer.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetAppleIosContainer.kt @@ -5,7 +5,6 @@ package fluxo.conf.dsl.container.impl.target import fluxo.conf.dsl.container.impl.ContainerContext import fluxo.conf.dsl.container.impl.ContainerHolderAware import fluxo.conf.dsl.container.impl.KmpTargetCode -import fluxo.conf.dsl.container.impl.KmpTargetCode.Companion.DEPRECATED_TARGET_MSG import fluxo.conf.dsl.container.impl.KmpTargetCode.IOS_SIMULATOR_ARM64 import fluxo.conf.dsl.container.impl.KmpTargetContainerImpl import fluxo.conf.dsl.container.target.AppleIosTarget @@ -22,11 +21,6 @@ internal abstract class TargetAppleIosContainer( interface Configure : AppleIosTarget.Configure, ContainerHolderAware { - @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION") - override fun iosArm32(targetName: String, configure: AppleIosTarget.() -> Unit) { - holder.configure(targetName, ::Arm32, KmpTargetCode.IOS_ARM32, configure) - } - override fun iosArm64(targetName: String, configure: AppleIosTarget.() -> Unit) { holder.configure(targetName, ::Arm64, KmpTargetCode.IOS_ARM64, configure) } @@ -44,14 +38,6 @@ internal abstract class TargetAppleIosContainer( } - @Deprecated(DEPRECATED_TARGET_MSG) - class Arm32(context: ContainerContext, targetName: String) : - TargetAppleIosContainer(context, targetName) { - - @Suppress("DEPRECATION", "DEPRECATION_ERROR", "KotlinRedundantDiagnosticSuppress") - override fun KotlinMultiplatformExtension.createTarget() = createTarget(::iosArm32) - } - class Arm64(context: ContainerContext, targetName: String) : TargetAppleIosContainer(context, targetName) { diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetAppleWatchosContainer.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetAppleWatchosContainer.kt index 9760b16f..cbb9281e 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetAppleWatchosContainer.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetAppleWatchosContainer.kt @@ -3,7 +3,6 @@ package fluxo.conf.dsl.container.impl.target import fluxo.conf.dsl.container.impl.ContainerContext import fluxo.conf.dsl.container.impl.ContainerHolderAware import fluxo.conf.dsl.container.impl.KmpTargetCode -import fluxo.conf.dsl.container.impl.KmpTargetCode.Companion.DEPRECATED_TARGET_MSG import fluxo.conf.dsl.container.impl.KmpTargetCode.WATCHOS_SIMULATOR_ARM64 import fluxo.conf.dsl.container.impl.KmpTargetContainerImpl import fluxo.conf.dsl.container.target.AppleWatchosTarget @@ -77,14 +76,6 @@ internal abstract class TargetAppleWatchosContainer( holder.configure(targetName, ::X64, KmpTargetCode.WATCHOS_X64, configure) } - @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION") - override fun watchosX86( - targetName: String, - configure: AppleWatchosTarget.() -> Unit, - ) { - holder.configure(targetName, ::X86, KmpTargetCode.WATCHOS_X86, configure) - } - override fun watchosSimulatorArm64( targetName: String, configure: AppleWatchosTarget.() -> Unit, @@ -119,14 +110,6 @@ internal abstract class TargetAppleWatchosContainer( override fun KotlinMultiplatformExtension.createTarget() = createTarget(::watchosX64) } - @Deprecated(DEPRECATED_TARGET_MSG) - class X86(context: ContainerContext, targetName: String) : - TargetAppleWatchosContainer(context, targetName) { - - @Suppress("DEPRECATION", "DEPRECATION_ERROR", "KotlinRedundantDiagnosticSuppress") - override fun KotlinMultiplatformExtension.createTarget() = createTarget(::watchosX86) - } - class SimulatorArm64(context: ContainerContext, targetName: String) : TargetAppleWatchosContainer(context, targetName) { diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetLinuxContainer.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetLinuxContainer.kt index 17cb54b4..443e306e 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetLinuxContainer.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetLinuxContainer.kt @@ -32,16 +32,6 @@ internal abstract class TargetLinuxContainer( override fun linuxArm32Hfp(targetName: String, configure: LinuxTarget.() -> Unit) { holder.configure(targetName, ::Arm32Hfp, KmpTargetCode.LINUX_ARM32_HFP, configure) } - - @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION") - override fun linuxMips32(targetName: String, configure: LinuxTarget.() -> Unit) { - holder.configure(targetName, ::Mips32, KmpTargetCode.LINUX_MIPS32, configure) - } - - @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION") - override fun linuxMipsel32(targetName: String, configure: LinuxTarget.() -> Unit) { - holder.configure(targetName, ::Mipsel32, KmpTargetCode.LINUX_MIPSEL32, configure) - } } @@ -64,20 +54,4 @@ internal abstract class TargetLinuxContainer( @Suppress("DEPRECATION") override fun KotlinMultiplatformExtension.createTarget() = createTarget(::linuxArm32Hfp) } - - @Deprecated(DEPRECATED_TARGET_MSG) - class Mips32(context: ContainerContext, targetName: String) : - TargetLinuxContainer(context, targetName) { - - @Suppress("DEPRECATION", "DEPRECATION_ERROR", "KotlinRedundantDiagnosticSuppress") - override fun KotlinMultiplatformExtension.createTarget() = createTarget(::linuxMips32) - } - - @Deprecated(DEPRECATED_TARGET_MSG) - class Mipsel32(context: ContainerContext, targetName: String) : - TargetLinuxContainer(context, targetName) { - - @Suppress("DEPRECATION", "DEPRECATION_ERROR", "KotlinRedundantDiagnosticSuppress") - override fun KotlinMultiplatformExtension.createTarget() = createTarget(::linuxMipsel32) - } } diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetMingwContainer.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetMingwContainer.kt index 8543286b..a1bc2f2d 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetMingwContainer.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetMingwContainer.kt @@ -5,7 +5,6 @@ package fluxo.conf.dsl.container.impl.target import fluxo.conf.dsl.container.impl.ContainerContext import fluxo.conf.dsl.container.impl.ContainerHolderAware import fluxo.conf.dsl.container.impl.KmpTargetCode -import fluxo.conf.dsl.container.impl.KmpTargetCode.Companion.DEPRECATED_TARGET_MSG import fluxo.conf.dsl.container.impl.KmpTargetContainerImpl import fluxo.conf.dsl.container.target.MingwTarget import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension @@ -24,11 +23,6 @@ internal abstract class TargetMingwContainer( override fun mingwX64(targetName: String, configure: MingwTarget.() -> Unit) { holder.configure(targetName, ::X64, KmpTargetCode.MINGW_X64, configure) } - - @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION") - override fun mingwX86(targetName: String, configure: MingwTarget.() -> Unit) { - holder.configure(targetName, ::X86, KmpTargetCode.MINGW_X86, configure) - } } class X64(context: ContainerContext, targetName: String) : @@ -36,12 +30,4 @@ internal abstract class TargetMingwContainer( override fun KotlinMultiplatformExtension.createTarget() = createTarget(::mingwX64) } - - @Deprecated(DEPRECATED_TARGET_MSG) - class X86(context: ContainerContext, targetName: String) : - TargetMingwContainer(context, targetName) { - - @Suppress("DEPRECATION", "DEPRECATION_ERROR", "KotlinRedundantDiagnosticSuppress") - override fun KotlinMultiplatformExtension.createTarget() = createTarget(::mingwX86) - } } diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetWasmNativeContainer.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetWasmNativeContainer.kt deleted file mode 100644 index 435cfdc8..00000000 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/impl/target/TargetWasmNativeContainer.kt +++ /dev/null @@ -1,34 +0,0 @@ -package fluxo.conf.dsl.container.impl.target - -import fluxo.conf.dsl.container.impl.ContainerContext -import fluxo.conf.dsl.container.impl.ContainerHolderAware -import fluxo.conf.dsl.container.impl.KmpTargetCode -import fluxo.conf.dsl.container.impl.KmpTargetContainerImpl -import fluxo.conf.dsl.container.target.WasmNativeTarget -import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget - -internal class TargetWasmNativeContainer( - context: ContainerContext, - name: String, -) : KmpTargetContainerImpl(context, name, WASM_NATIVE_SORT_ORDER), - KmpTargetContainerImpl.NonJvm.Native.WasmNative, - WasmNativeTarget { - - interface Configure : WasmNativeTarget.Configure, ContainerHolderAware { - - @Suppress("OVERRIDE_DEPRECATION") - override fun wasm32(targetName: String, configure: WasmNativeTarget.() -> Unit) { - holder.configure( - targetName = targetName, - contruct = ::TargetWasmNativeContainer, - code = KmpTargetCode.WASM32, - action = configure, - ) - } - } - - - @Suppress("DEPRECATION", "DEPRECATION_ERROR") - override fun KotlinMultiplatformExtension.createTarget() = createTarget(::wasm32) -} diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/AppleIosTarget.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/AppleIosTarget.kt index d9e36ae7..ae9efbb9 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/AppleIosTarget.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/AppleIosTarget.kt @@ -1,14 +1,11 @@ package fluxo.conf.dsl.container.target import fluxo.conf.dsl.container.KotlinTargetContainer -import fluxo.conf.dsl.container.impl.KmpTargetCode.Companion.DEPRECATED_TARGET_MSG import fluxo.conf.impl.EMPTY_FUN import iosCompat import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests -// FIXME: Public hierarchy of targets for easier configuration - public interface AppleIosTarget : KotlinTargetContainer { public interface Configure { @@ -26,12 +23,6 @@ public interface AppleIosTarget : KotlinTargetContai } - @Deprecated(message = DEPRECATED_TARGET_MSG) - public fun iosArm32( - targetName: String = "iosArm32", - configure: AppleIosTarget.() -> Unit = EMPTY_FUN, - ) - public fun iosArm64( targetName: String = "iosArm64", configure: AppleIosTarget.() -> Unit = EMPTY_FUN, diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/AppleWatchosTarget.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/AppleWatchosTarget.kt index 509b98e1..8e556a5e 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/AppleWatchosTarget.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/AppleWatchosTarget.kt @@ -1,7 +1,6 @@ package fluxo.conf.dsl.container.target import fluxo.conf.dsl.container.KotlinTargetContainer -import fluxo.conf.dsl.container.impl.KmpTargetCode.Companion.DEPRECATED_TARGET_MSG import fluxo.conf.impl.EMPTY_FUN import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests as KNTST @@ -41,12 +40,6 @@ public interface AppleWatchosTarget : KotlinTargetCo configure: AppleWatchosTarget.() -> Unit = EMPTY_FUN, ) - @Deprecated(message = DEPRECATED_TARGET_MSG) - public fun watchosX86( - targetName: String = "watchosX86", - configure: AppleWatchosTarget.() -> Unit = EMPTY_FUN, - ) - public fun watchosSimulatorArm64( targetName: String = "watchosSimulatorArm64", configure: AppleWatchosTarget.() -> Unit = EMPTY_FUN, diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/LinuxTarget.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/LinuxTarget.kt index 150173dc..b403d9c5 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/LinuxTarget.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/LinuxTarget.kt @@ -31,17 +31,5 @@ public interface LinuxTarget : KotlinTargetContainer targetName: String = "linuxArm32Hfp", configure: LinuxTarget.() -> Unit = EMPTY_FUN, ) - - @Deprecated(DEPRECATED_TARGET_MSG) - public fun linuxMips32( - targetName: String = "linuxMips32", - configure: LinuxTarget.() -> Unit = EMPTY_FUN, - ) - - @Deprecated(DEPRECATED_TARGET_MSG) - public fun linuxMipsel32( - targetName: String = "linuxMipsel32", - configure: LinuxTarget.() -> Unit = EMPTY_FUN, - ) } } diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/MingwTarget.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/MingwTarget.kt index 88b6609a..c5a50a6b 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/MingwTarget.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/MingwTarget.kt @@ -1,7 +1,6 @@ package fluxo.conf.dsl.container.target import fluxo.conf.dsl.container.KotlinTargetContainer -import fluxo.conf.dsl.container.impl.KmpTargetCode.Companion.DEPRECATED_TARGET_MSG import fluxo.conf.impl.EMPTY_FUN import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTests @@ -20,11 +19,5 @@ public interface MingwTarget : KotlinTargetContainer targetName: String = "mingwX64", configure: MingwTarget.() -> Unit = EMPTY_FUN, ) - - @Deprecated(DEPRECATED_TARGET_MSG) - public fun mingwX86( - targetName: String = "mingwX86", - configure: MingwTarget.() -> Unit = EMPTY_FUN, - ) } } diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/WasmNativeTarget.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/WasmNativeTarget.kt deleted file mode 100644 index 3ccda700..00000000 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/dsl/container/target/WasmNativeTarget.kt +++ /dev/null @@ -1,23 +0,0 @@ -package fluxo.conf.dsl.container.target - -import fluxo.conf.dsl.container.KotlinTargetContainer -import fluxo.conf.dsl.container.impl.KmpTargetCode.Companion.DEPRECATED_TARGET_MSG -import fluxo.conf.impl.EMPTY_FUN -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget - -public interface WasmNativeTarget : KotlinTargetContainer { - - public interface Configure { - @Suppress("DeprecatedCallableAddReplaceWith", "DEPRECATION") - @Deprecated(DEPRECATED_TARGET_MSG) - public fun wasmNative(configure: WasmNativeTarget.() -> Unit = EMPTY_FUN) { - wasm32(configure = configure) - } - - @Deprecated(DEPRECATED_TARGET_MSG) - public fun wasm32( - targetName: String = "wasm32", - configure: WasmNativeTarget.() -> Unit = EMPTY_FUN, - ) - } -} diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/KotlinSetupDiagnosticTasks.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/KotlinSetupDiagnosticTasks.kt index 6a8b5af7..6843f68a 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/KotlinSetupDiagnosticTasks.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/KotlinSetupDiagnosticTasks.kt @@ -101,9 +101,6 @@ private fun Project.printKotlinTargetsInfo() { // source set specific to this compilation compilation.kotlinSourceSets - compilation.compilerOptions.options - compilation.kotlinOptions - // List of compilation, which compiled outputs are used. // Associating compilations establishes internal visibility between them. compilation.associatedCompilations diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupDetekt.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupDetekt.kt index ac25506c..7aceda65 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupDetekt.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupDetekt.kt @@ -387,7 +387,7 @@ private fun DetectedTaskPlatform?.toKmpTargetCodes(): Array { DetectedTaskPlatform.LINUX -> KmpTargetCode.LINUX DetectedTaskPlatform.MINGW -> KmpTargetCode.MINGW DetectedTaskPlatform.JS -> arrayOf(KmpTargetCode.JS) - DetectedTaskPlatform.WASM -> KmpTargetCode.COMMON_WASM + KmpTargetCode.WASM32 + DetectedTaskPlatform.WASM -> KmpTargetCode.COMMON_WASM DetectedTaskPlatform.ANDROID -> arrayOf(KmpTargetCode.ANDROID) DetectedTaskPlatform.JVM -> arrayOf(KmpTargetCode.JVM) null, DetectedTaskPlatform.UNKNOWN -> arrayOf() diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupPublication.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupPublication.kt index 5ae807bf..c8e76f0b 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupPublication.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupPublication.kt @@ -143,8 +143,13 @@ private fun Project.setupGradleProjectPublication( tasks.withType { isPreserveFileTimestamps = false isReproducibleFileOrder = true - dirMode = "0755".toInt(radix = 8) - fileMode = "0644".toInt(radix = 8) + try { + // Deprecated in Gradle 8.8 + dirMode = "0755".toInt(radix = 8) + fileMode = "0644".toInt(radix = 8) + } catch (e: Throwable) { + logger.e("dirMode/fileMode reproducibleArtifacts setup error: $e", e) + } } } } diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupTestsReport.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupTestsReport.kt index fe499bc8..4d778ae4 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupTestsReport.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/feat/SetupTestsReport.kt @@ -168,7 +168,6 @@ private fun nativeFamilyFromString(platform: String?): Family = when { platform.equals("android", ignoreCase = true) -> Family.ANDROID platform.equals("linux", ignoreCase = true) -> Family.LINUX - platform.equals("wasm", ignoreCase = true) -> Family.WASM platform.equals("mingw", ignoreCase = true) || platform.equals("win", ignoreCase = true) || diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/DependencyHandlerUtils.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/DependencyHandlerUtils.kt index a545e5cf..4584a590 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/DependencyHandlerUtils.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/DependencyHandlerUtils.kt @@ -16,7 +16,6 @@ import org.gradle.api.artifacts.dsl.DependencyHandler import org.gradle.api.provider.Provider import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler -import org.jetbrains.kotlin.gradle.plugin.mpp.DefaultKotlinDependencyHandler private const val IMPLEMENTATION = org.jetbrains.kotlin.gradle.utils.IMPLEMENTATION @@ -178,8 +177,11 @@ private inline fun KotlinDependencyHandler.logKmpDependency( configurationNameAccessor: HasKotlinDependencies.() -> String, ) { val confName = try { + @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") when (this) { - is DefaultKotlinDependencyHandler -> configurationNameAccessor(parent) + is org.jetbrains.kotlin.gradle.plugin.mpp.DefaultKotlinDependencyHandler -> + configurationNameAccessor(parent) + else -> null } } catch (e: Throwable) { diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/kotlin/KotlinConfigSetup.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/kotlin/KotlinConfigSetup.kt index 97737d77..2100da70 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/kotlin/KotlinConfigSetup.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/kotlin/KotlinConfigSetup.kt @@ -18,7 +18,7 @@ internal fun FluxoConfigurationExtensionImpl.KotlinConfig( val context = ctx val pluginVersion = context.kotlinPluginVersion val coreLibs = kotlinCoreLibraries - ?.takeIf { it.isNotBlank() && it != pluginVersion.toString() } + ?.takeIf { it.isNotBlank() && it != "0" && it != pluginVersion.toString() } ?: k.coreLibrariesVersion // Note: apiVersion can't be greater than languageVersion! diff --git a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/kotlin/SetupKotlinOptions.kt b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/kotlin/SetupKotlinOptions.kt index e5004d2d..33de7f82 100644 --- a/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/kotlin/SetupKotlinOptions.kt +++ b/fluxo-kmp-conf/src/main/kotlin/fluxo/conf/impl/kotlin/SetupKotlinOptions.kt @@ -152,11 +152,6 @@ internal fun KotlinCommonOptions.setupKotlinOptions( isJs = true isJvm = false compilerArgs.addAll(JS_OPTS) - - if (conf.isApplication) { - // Don't generate .meta.js and .kjsm files with library metadata. - metaInfo = false - } } else -> { @@ -324,9 +319,6 @@ private val LATEST_OPTS = arrayOf( // The corresponding calls' declarations may not be marked with @BuilderInference. "-Xenable-builder-inference", - // Enable experimental language feature: effect system. - "-Xeffect-system", - // Enable new experimental generic type inference algorithm. "-Xnew-inference", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 51c59890..8d559fdc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,23 +13,23 @@ version = "0.8.2-SNAPSHOT" # Java/Kotlin compatibility # WARNING: kotlinApiVersion can't be greater than kotlinLangVersion! # javaLangTarget 11 required for Android Gradle Plugin and Android Lint. -javaLangTarget = "11" -kotlinLangVersion = "1.8" -kotlinApiVersion = "1.8" -kotlinCoreLibraries = "1.8.22" +javaLangTarget = "latest" +kotlinLangVersion = "latest" +kotlinApiVersion = "latest" +#kotlinCoreLibraries = "2.0.0" # Kotlin version, aligned with Compose Multiplatform # https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin # https://github.com/JetBrains/kotlin/releases # WARNING: Do not forget to update the version badge and examples in `README.md`! -kotlin = "1.9.23" +kotlin = "2.0.0-RC3" # Compose Multiplatform from JetBrains # https://github.com/JetBrains/compose-multiplatform/releases -jetbrains-compose = "1.6.2" +jetbrains-compose = "1.6.10-rc03" # https://github.com/google/ksp/releases -ksp = "1.9.23-1.0.20" +ksp = "2.0.0-RC3-1.0.20" # region Android specific @@ -87,7 +87,7 @@ androidCompileSdk = "34" # Takes precedence over all other SDK versions! # "0" value used to ignore this setting. # E.g., to use the Android U preview use `androidPreviewSdk = "U"`. -androidPreviewSdk = "0" +#androidPreviewSdk = "0" # Compilers, packaging, deployment tools for Android apps. # https://developer.android.com/tools/releases/build-tools @@ -103,7 +103,7 @@ android-gradle-plugin = "8.4.0" # Public API management tool # https://github.com/Kotlin/binary-compatibility-validator/releases -bcv = "0.14.0" +bcv = "0.15.0-Beta.2" # Kotlin/JS API support for the KotlinX Binary Compatibility Validator based on the generated TS definitions. # https://github.com/fluxo-kt/fluxo-bcv-js/releases. @@ -167,7 +167,7 @@ okhttp = "4.12.0" # Google core libraries for Java. # https://github.com/google/guava/releases -guava = "33.1.0-jre" +guava = "33.2.0-jre" # Douglas Crockford's reference Java implementation of a JSON. # https://github.com/stleary/JSON-java/releases @@ -181,7 +181,7 @@ ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" } # https://github.com/mrmans0n/compose-rules/releases # https://mvnrepository.com/artifact/io.nlopez.compose.rules/detekt -detekt-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.3.20" } +detekt-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.4.1" } detekt-core = { module = "io.gitlab.arturbosch.detekt:detekt-core", version.ref = "detekt" } detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } detekt-libraries = { module = "io.gitlab.arturbosch.detekt:detekt-rules-libraries", version.ref = "detekt" } @@ -192,6 +192,7 @@ plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", v plugin-intellij = { module = "org.jetbrains.intellij.plugins:gradle-intellij-plugin", version.ref = "gradle-intellij-plugin" } plugin-jetbrains-compose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrains-compose" } plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +plugin-kotlin-compose = { module = "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin", version.ref = "kotlin" } plugin-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" } plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" } @@ -233,6 +234,7 @@ fluxo-conf = { id = "io.github.fluxo-kt.fluxo-kmp-conf", version.ref = "version" kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-sam-receiver = { id = "org.jetbrains.kotlin.plugin.sam.with.receiver", version.ref = "kotlin" } dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } @@ -300,4 +302,4 @@ build-config = { id = "com.github.gmazzo.buildconfig", version = "5.3.5" } # Resolve all dependencies used in a Gradle module, with associated license and further information. # https://github.com/mikepenz/AboutLibraries/releases # https://plugins.gradle.org/plugin/com.mikepenz.aboutlibraries.plugin -about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version = "11.1.4" } +about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version = "11.2.0-a01" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9712a9f9..cf29e167 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -5,8 +5,8 @@ # WARNING: Do not forget to update the version badge in `README.md`! distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionSha256Sum=a2e1cfee7ffdeee86015b85b2dd2a435032c40eedc01d8172285556c7d8fea13 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/self/build.gradle.kts b/self/build.gradle.kts index afd61503..03e808ee 100644 --- a/self/build.gradle.kts +++ b/self/build.gradle.kts @@ -63,6 +63,7 @@ dependencies { compileOnly(libs.plugin.intellij) compileOnly(libs.plugin.jetbrains.compose) compileOnly(libs.plugin.kotlin) + compileOnly(libs.plugin.kotlin.compose) compileOnly(libs.plugin.ksp) compileOnly(libs.plugins.gradle.enterprise.toModuleDependency()) diff --git a/updateBaseline b/updateBaseline index deeebc99..a7c8270c 100644 --- a/updateBaseline +++ b/updateBaseline @@ -11,13 +11,13 @@ echo "====================================" export GRADLE_OPTS="${GRADLE_OPTS} -Dorg.gradle.caching=false -Dkotlin.incremental=false -Dorg.gradle.logging.stacktrace=all" # -U: Refresh dependencies -./gradlew dependencyGuardBaseline apiDump detektBaselineMerge -U --continue --rerun-tasks || exit 101 +./gradlew dependencyGuardBaseline detektBaselineMerge -U --continue --rerun-tasks || exit 101 echo "" echo "=======> checks/gradle-plugin" cd checks/gradle-plugin || exit 102 pwd -./gradlew dependencyGuardBaseline apiDump detektBaselineMerge -U --continue || exit 103 +./gradlew dependencyGuardBaseline detektBaselineMerge -U --continue || exit 103 echo "" echo "=======> checks/kmp"