From 09294eef5bebe0f7c80848adfb3405121b9d8efc Mon Sep 17 00:00:00 2001 From: dev Date: Fri, 23 Feb 2024 16:04:17 +0200 Subject: [PATCH 01/32] Rename :compose-app -> :compose-android-app Gradle module --- .../build.gradle.kts | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../playground/EndlessForegroundService.kt | 0 .../java/io/architecture/playground/MapActivity.kt | 0 .../playground/PlaygroundApplication.kt | 0 .../main/res/drawable/ic_launcher_background.xml | 0 .../main/res/drawable/ic_launcher_foreground.xml | 0 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xhdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin .../src/main/res/values-night/themes.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/developer-config.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/themes.xml | 0 .../src/main/res/xml/backup_rules.xml | 0 .../src/main/res/xml/data_extraction_rules.xml | 0 .../src/main/res/xml/network_security.xml | 0 settings.gradle.kts | 2 +- 29 files changed, 1 insertion(+), 1 deletion(-) rename {compose-app => compose-android-app}/build.gradle.kts (100%) rename {compose-app => compose-android-app}/proguard-rules.pro (100%) rename {compose-app => compose-android-app}/src/main/AndroidManifest.xml (100%) rename {compose-app => compose-android-app}/src/main/java/io/architecture/playground/EndlessForegroundService.kt (100%) rename {compose-app => compose-android-app}/src/main/java/io/architecture/playground/MapActivity.kt (100%) rename {compose-app => compose-android-app}/src/main/java/io/architecture/playground/PlaygroundApplication.kt (100%) rename {compose-app => compose-android-app}/src/main/res/drawable/ic_launcher_background.xml (100%) rename {compose-app => compose-android-app}/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-hdpi/ic_launcher.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-mdpi/ic_launcher.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%) rename {compose-app => compose-android-app}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%) rename {compose-app => compose-android-app}/src/main/res/values-night/themes.xml (100%) rename {compose-app => compose-android-app}/src/main/res/values/colors.xml (100%) rename {compose-app => compose-android-app}/src/main/res/values/developer-config.xml (100%) rename {compose-app => compose-android-app}/src/main/res/values/strings.xml (100%) rename {compose-app => compose-android-app}/src/main/res/values/themes.xml (100%) rename {compose-app => compose-android-app}/src/main/res/xml/backup_rules.xml (100%) rename {compose-app => compose-android-app}/src/main/res/xml/data_extraction_rules.xml (100%) rename {compose-app => compose-android-app}/src/main/res/xml/network_security.xml (100%) diff --git a/compose-app/build.gradle.kts b/compose-android-app/build.gradle.kts similarity index 100% rename from compose-app/build.gradle.kts rename to compose-android-app/build.gradle.kts diff --git a/compose-app/proguard-rules.pro b/compose-android-app/proguard-rules.pro similarity index 100% rename from compose-app/proguard-rules.pro rename to compose-android-app/proguard-rules.pro diff --git a/compose-app/src/main/AndroidManifest.xml b/compose-android-app/src/main/AndroidManifest.xml similarity index 100% rename from compose-app/src/main/AndroidManifest.xml rename to compose-android-app/src/main/AndroidManifest.xml diff --git a/compose-app/src/main/java/io/architecture/playground/EndlessForegroundService.kt b/compose-android-app/src/main/java/io/architecture/playground/EndlessForegroundService.kt similarity index 100% rename from compose-app/src/main/java/io/architecture/playground/EndlessForegroundService.kt rename to compose-android-app/src/main/java/io/architecture/playground/EndlessForegroundService.kt diff --git a/compose-app/src/main/java/io/architecture/playground/MapActivity.kt b/compose-android-app/src/main/java/io/architecture/playground/MapActivity.kt similarity index 100% rename from compose-app/src/main/java/io/architecture/playground/MapActivity.kt rename to compose-android-app/src/main/java/io/architecture/playground/MapActivity.kt diff --git a/compose-app/src/main/java/io/architecture/playground/PlaygroundApplication.kt b/compose-android-app/src/main/java/io/architecture/playground/PlaygroundApplication.kt similarity index 100% rename from compose-app/src/main/java/io/architecture/playground/PlaygroundApplication.kt rename to compose-android-app/src/main/java/io/architecture/playground/PlaygroundApplication.kt diff --git a/compose-app/src/main/res/drawable/ic_launcher_background.xml b/compose-android-app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from compose-app/src/main/res/drawable/ic_launcher_background.xml rename to compose-android-app/src/main/res/drawable/ic_launcher_background.xml diff --git a/compose-app/src/main/res/drawable/ic_launcher_foreground.xml b/compose-android-app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from compose-app/src/main/res/drawable/ic_launcher_foreground.xml rename to compose-android-app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/compose-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/compose-android-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from compose-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to compose-android-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/compose-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/compose-android-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from compose-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to compose-android-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/compose-app/src/main/res/mipmap-hdpi/ic_launcher.webp b/compose-android-app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from compose-app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to compose-android-app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/compose-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/compose-android-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from compose-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to compose-android-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/compose-app/src/main/res/mipmap-mdpi/ic_launcher.webp b/compose-android-app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from compose-app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to compose-android-app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/compose-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/compose-android-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from compose-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to compose-android-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/compose-app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/compose-android-app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from compose-app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to compose-android-app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/compose-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/compose-android-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from compose-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to compose-android-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/compose-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/compose-android-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from compose-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to compose-android-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/compose-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/compose-android-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from compose-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to compose-android-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/compose-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/compose-android-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from compose-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to compose-android-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/compose-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/compose-android-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from compose-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to compose-android-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/compose-app/src/main/res/values-night/themes.xml b/compose-android-app/src/main/res/values-night/themes.xml similarity index 100% rename from compose-app/src/main/res/values-night/themes.xml rename to compose-android-app/src/main/res/values-night/themes.xml diff --git a/compose-app/src/main/res/values/colors.xml b/compose-android-app/src/main/res/values/colors.xml similarity index 100% rename from compose-app/src/main/res/values/colors.xml rename to compose-android-app/src/main/res/values/colors.xml diff --git a/compose-app/src/main/res/values/developer-config.xml b/compose-android-app/src/main/res/values/developer-config.xml similarity index 100% rename from compose-app/src/main/res/values/developer-config.xml rename to compose-android-app/src/main/res/values/developer-config.xml diff --git a/compose-app/src/main/res/values/strings.xml b/compose-android-app/src/main/res/values/strings.xml similarity index 100% rename from compose-app/src/main/res/values/strings.xml rename to compose-android-app/src/main/res/values/strings.xml diff --git a/compose-app/src/main/res/values/themes.xml b/compose-android-app/src/main/res/values/themes.xml similarity index 100% rename from compose-app/src/main/res/values/themes.xml rename to compose-android-app/src/main/res/values/themes.xml diff --git a/compose-app/src/main/res/xml/backup_rules.xml b/compose-android-app/src/main/res/xml/backup_rules.xml similarity index 100% rename from compose-app/src/main/res/xml/backup_rules.xml rename to compose-android-app/src/main/res/xml/backup_rules.xml diff --git a/compose-app/src/main/res/xml/data_extraction_rules.xml b/compose-android-app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from compose-app/src/main/res/xml/data_extraction_rules.xml rename to compose-android-app/src/main/res/xml/data_extraction_rules.xml diff --git a/compose-app/src/main/res/xml/network_security.xml b/compose-android-app/src/main/res/xml/network_security.xml similarity index 100% rename from compose-app/src/main/res/xml/network_security.xml rename to compose-android-app/src/main/res/xml/network_security.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index c23a4cf..53408f3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -28,7 +28,7 @@ dependencyResolutionManagement { } } include(":ktor-server-app") -include(":compose-app") +include(":compose-android-app") include(":core:common") include(":core:model") From ce07055f3bee0dd31c102ce6590021a6235d9389 Mon Sep 17 00:00:00 2001 From: dev Date: Sat, 24 Feb 2024 12:58:32 +0200 Subject: [PATCH 02/32] Configured basic multiplatform project ios, android, desktop-jvm and web-wasm targeted --- .gitignore | 55 +- .run/Android app.run.xml | 69 + .run/Desktop app.run.xml | 24 + .run/IOS app.run.xml | 7 + {.nettyServer => .run}/Netty server.run.xml | 0 .run/Web app.run.xml | 24 + build.gradle.kts | 1 + compose-android-app/build.gradle.kts | 21 +- .../{main => androidMain}/AndroidManifest.xml | 0 .../playground/EndlessForegroundService.kt | 0 .../io/architecture/playground/MapActivity.kt | 4 + .../playground/PlaygroundApplication.kt | 0 .../res/drawable/ic_launcher_background.xml | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../res/mipmap-hdpi/ic_launcher.webp | Bin .../res/mipmap-hdpi/ic_launcher_round.webp | Bin .../res/mipmap-mdpi/ic_launcher.webp | Bin .../res/mipmap-mdpi/ic_launcher_round.webp | Bin .../res/mipmap-xhdpi/ic_launcher.webp | Bin .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin .../res/mipmap-xxhdpi/ic_launcher.webp | Bin .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin .../res/mipmap-xxxhdpi/ic_launcher.webp | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin .../res/values-night/themes.xml | 0 .../res/values/colors.xml | 0 .../res/values/developer-config.xml | 0 .../res/values/strings.xml | 0 .../res/values/themes.xml | 0 .../res/xml/backup_rules.xml | 0 .../res/xml/data_extraction_rules.xml | 0 .../res/xml/network_security.xml | 0 compose-common/build.gradle.kts | 62 + compose-common/src/commonMain/kotlin/App.kt | 38 + .../resources/compose-multiplatform.xml | 36 + compose-desktop-app/build.gradle.kts | 31 + .../src/desktopMain/kotlin/main.kt | 16 + compose-ios-app/build.gradle.kts | 34 + .../compose-ios-app.xcodeproj/project.pbxproj | 393 +++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 98 + .../Assets.xcassets/Contents.json | 6 + .../compose-ios-app/ContentView.swift | 16 + compose-ios-app/compose-ios-app/Info.plist | 48 + .../Preview Assets.xcassets/Contents.json | 6 + compose-ios-app/compose-ios-app/iOSApp.swift | 10 + compose-web-app/build.gradle.kts | 51 + compose-web-app/src/wasmJsMain/kotlin/main.kt | 7 + .../src/wasmJsMain/resources/index.html | 12 + gradle.properties | 36 +- gradle/libs.versions.toml | 3 +- kotlin-js-store/yarn.lock | 2866 +++++++++++++++++ settings.gradle.kts | 12 +- shared/build.gradle.kts | 52 + .../androidMain/kotlin/Platform.android.kt | 7 + shared/src/commonMain/kotlin/Platform.kt | 5 + shared/src/iosMain/kotlin/Platform.ios.kt | 7 + shared/src/jvmMain/kotlin/Platform.jvm.kt | 5 + .../src/wasmJsMain/kotlin/Platform.wasmJs.kt | 5 + 62 files changed, 4057 insertions(+), 29 deletions(-) create mode 100644 .run/Android app.run.xml create mode 100644 .run/Desktop app.run.xml create mode 100644 .run/IOS app.run.xml rename {.nettyServer => .run}/Netty server.run.xml (100%) create mode 100644 .run/Web app.run.xml rename compose-android-app/src/{main => androidMain}/AndroidManifest.xml (100%) rename compose-android-app/src/{main/java => androidMain/kotlin}/io/architecture/playground/EndlessForegroundService.kt (100%) rename compose-android-app/src/{main/java => androidMain/kotlin}/io/architecture/playground/MapActivity.kt (87%) rename compose-android-app/src/{main/java => androidMain/kotlin}/io/architecture/playground/PlaygroundApplication.kt (100%) rename compose-android-app/src/{main => androidMain}/res/drawable/ic_launcher_background.xml (100%) rename compose-android-app/src/{main => androidMain}/res/drawable/ic_launcher_foreground.xml (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-hdpi/ic_launcher.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-hdpi/ic_launcher_round.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-mdpi/ic_launcher.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-xhdpi/ic_launcher.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-xhdpi/ic_launcher_round.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-xxhdpi/ic_launcher.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-xxhdpi/ic_launcher_round.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-xxxhdpi/ic_launcher.webp (100%) rename compose-android-app/src/{main => androidMain}/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%) rename compose-android-app/src/{main => androidMain}/res/values-night/themes.xml (100%) rename compose-android-app/src/{main => androidMain}/res/values/colors.xml (100%) rename compose-android-app/src/{main => androidMain}/res/values/developer-config.xml (100%) rename compose-android-app/src/{main => androidMain}/res/values/strings.xml (100%) rename compose-android-app/src/{main => androidMain}/res/values/themes.xml (100%) rename compose-android-app/src/{main => androidMain}/res/xml/backup_rules.xml (100%) rename compose-android-app/src/{main => androidMain}/res/xml/data_extraction_rules.xml (100%) rename compose-android-app/src/{main => androidMain}/res/xml/network_security.xml (100%) create mode 100644 compose-common/build.gradle.kts create mode 100644 compose-common/src/commonMain/kotlin/App.kt create mode 100644 compose-common/src/commonMain/resources/compose-multiplatform.xml create mode 100644 compose-desktop-app/build.gradle.kts create mode 100644 compose-desktop-app/src/desktopMain/kotlin/main.kt create mode 100644 compose-ios-app/build.gradle.kts create mode 100644 compose-ios-app/compose-ios-app.xcodeproj/project.pbxproj create mode 100644 compose-ios-app/compose-ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 compose-ios-app/compose-ios-app/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 compose-ios-app/compose-ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 compose-ios-app/compose-ios-app/Assets.xcassets/Contents.json create mode 100644 compose-ios-app/compose-ios-app/ContentView.swift create mode 100644 compose-ios-app/compose-ios-app/Info.plist create mode 100644 compose-ios-app/compose-ios-app/Preview Content/Preview Assets.xcassets/Contents.json create mode 100644 compose-ios-app/compose-ios-app/iOSApp.swift create mode 100644 compose-web-app/build.gradle.kts create mode 100644 compose-web-app/src/wasmJsMain/kotlin/main.kt create mode 100644 compose-web-app/src/wasmJsMain/resources/index.html create mode 100644 kotlin-js-store/yarn.lock create mode 100644 shared/build.gradle.kts create mode 100644 shared/src/androidMain/kotlin/Platform.android.kt create mode 100644 shared/src/commonMain/kotlin/Platform.kt create mode 100644 shared/src/iosMain/kotlin/Platform.ios.kt create mode 100644 shared/src/jvmMain/kotlin/Platform.jvm.kt create mode 100644 shared/src/wasmJsMain/kotlin/Platform.wasmJs.kt diff --git a/.gitignore b/.gitignore index 5788c62..0979103 100644 --- a/.gitignore +++ b/.gitignore @@ -2,12 +2,15 @@ .idea .gradle/ app/build/ +.gradle +**/build/ # Local configuration file (sdk path, etc) local.properties # Log/OS Files *.log +.DS_Store # Android Studio generated files and folders captures/ @@ -33,14 +36,54 @@ google-services.json # Android Profiling *.hprof +# Diagram backups *.drawio.bkp -.DS_Store - -server/ -ktor-server/build/ +/docs/*.drawio.bkp +build/ -app/src/main/res/values/developer-config.xml +# Android +**/developer-config.xml +# Internal /TODO.md -/docs/.$design.drawio.bkp + + +# Xcode +## Obj-C/Swift specific +*.hmap +## App packaging +*.ipa +*.dSYM.zip +*.dSYM +# Swift Package Manager +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +Packages/ +Package.pins +Package.resolved + +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +.swiftpm +# CocoaPods - Only use to conserve bandwidth / Save time on Pushing +# - Also handy if you have a large number of dependant pods +# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE +Pods/ +.build/ + +## Xcode 8 and earlier + +### Xcode Patch ### +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcodeproj/project.xcworkspace/ +!*.xcworkspace/contents.xcworkspacedata +/*.gcno +**/xcshareddata/WorkspaceSettings.xcsettings + +xcuserdata +!src/**/build/ +captures +.externalNativeBuild +.cxx diff --git a/.run/Android app.run.xml b/.run/Android app.run.xml new file mode 100644 index 0000000..5d30f22 --- /dev/null +++ b/.run/Android app.run.xml @@ -0,0 +1,69 @@ + + + + + \ No newline at end of file diff --git a/.run/Desktop app.run.xml b/.run/Desktop app.run.xml new file mode 100644 index 0000000..2cbe819 --- /dev/null +++ b/.run/Desktop app.run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/.run/IOS app.run.xml b/.run/IOS app.run.xml new file mode 100644 index 0000000..b6ac54f --- /dev/null +++ b/.run/IOS app.run.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.nettyServer/Netty server.run.xml b/.run/Netty server.run.xml similarity index 100% rename from .nettyServer/Netty server.run.xml rename to .run/Netty server.run.xml diff --git a/.run/Web app.run.xml b/.run/Web app.run.xml new file mode 100644 index 0000000..52f200c --- /dev/null +++ b/.run/Web app.run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 49bbfcb..beb8a69 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,6 +10,7 @@ plugins { alias(libs.plugins.androidx.benchmark) apply false alias(libs.plugins.kotlinJvm) apply false alias(libs.plugins.kotlinMultiplatform) apply false + alias(libs.plugins.jetbrainsCompose) apply false alias(libs.plugins.modulegraph) alias(libs.plugins.ksp) } diff --git a/compose-android-app/build.gradle.kts b/compose-android-app/build.gradle.kts index 82320be..66da0b8 100644 --- a/compose-android-app/build.gradle.kts +++ b/compose-android-app/build.gradle.kts @@ -3,10 +3,22 @@ import java.net.NetworkInterface plugins { alias(libs.plugins.androidApplication) - alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.ksp) } +kotlin { + androidTarget() + sourceSets { + val androidMain by getting { + dependencies { + implementation(projects.shared) + implementation(projects.composeCommon) + } + } + } +} + android { namespace = "io.architecture.playground" compileSdk = libs.versions.compileSdk.get().toInt() @@ -48,17 +60,14 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } packaging { resources { excludes.add("/META-INF/{AL2.0,LGPL2.1}") } } - kotlinOptions { - jvmTarget = libs.versions.jvmTarget.get() - } composeOptions { kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() } diff --git a/compose-android-app/src/main/AndroidManifest.xml b/compose-android-app/src/androidMain/AndroidManifest.xml similarity index 100% rename from compose-android-app/src/main/AndroidManifest.xml rename to compose-android-app/src/androidMain/AndroidManifest.xml diff --git a/compose-android-app/src/main/java/io/architecture/playground/EndlessForegroundService.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/EndlessForegroundService.kt similarity index 100% rename from compose-android-app/src/main/java/io/architecture/playground/EndlessForegroundService.kt rename to compose-android-app/src/androidMain/kotlin/io/architecture/playground/EndlessForegroundService.kt diff --git a/compose-android-app/src/main/java/io/architecture/playground/MapActivity.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt similarity index 87% rename from compose-android-app/src/main/java/io/architecture/playground/MapActivity.kt rename to compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt index faf6c4e..13388ca 100644 --- a/compose-android-app/src/main/java/io/architecture/playground/MapActivity.kt +++ b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt @@ -3,8 +3,10 @@ package io.architecture.playground import android.content.Intent import android.os.Build import android.os.Bundle +import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import getPlatform import io.architecture.map.MapScreen import org.koin.compose.KoinContext @@ -13,6 +15,8 @@ class MapActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { // TODO Implement Splash screen API + user data fetching super.onCreate(savedInstanceState) + Toast.makeText(this, getPlatform().name, Toast.LENGTH_LONG).show() + setContent { KoinContext { MapScreen() diff --git a/compose-android-app/src/main/java/io/architecture/playground/PlaygroundApplication.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt similarity index 100% rename from compose-android-app/src/main/java/io/architecture/playground/PlaygroundApplication.kt rename to compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt diff --git a/compose-android-app/src/main/res/drawable/ic_launcher_background.xml b/compose-android-app/src/androidMain/res/drawable/ic_launcher_background.xml similarity index 100% rename from compose-android-app/src/main/res/drawable/ic_launcher_background.xml rename to compose-android-app/src/androidMain/res/drawable/ic_launcher_background.xml diff --git a/compose-android-app/src/main/res/drawable/ic_launcher_foreground.xml b/compose-android-app/src/androidMain/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from compose-android-app/src/main/res/drawable/ic_launcher_foreground.xml rename to compose-android-app/src/androidMain/res/drawable/ic_launcher_foreground.xml diff --git a/compose-android-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/compose-android-app/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from compose-android-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to compose-android-app/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/compose-android-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/compose-android-app/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from compose-android-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to compose-android-app/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/compose-android-app/src/main/res/mipmap-hdpi/ic_launcher.webp b/compose-android-app/src/androidMain/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to compose-android-app/src/androidMain/res/mipmap-hdpi/ic_launcher.webp diff --git a/compose-android-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/compose-android-app/src/androidMain/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to compose-android-app/src/androidMain/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/compose-android-app/src/main/res/mipmap-mdpi/ic_launcher.webp b/compose-android-app/src/androidMain/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to compose-android-app/src/androidMain/res/mipmap-mdpi/ic_launcher.webp diff --git a/compose-android-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/compose-android-app/src/androidMain/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to compose-android-app/src/androidMain/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/compose-android-app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/compose-android-app/src/androidMain/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to compose-android-app/src/androidMain/res/mipmap-xhdpi/ic_launcher.webp diff --git a/compose-android-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/compose-android-app/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to compose-android-app/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/compose-android-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/compose-android-app/src/androidMain/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to compose-android-app/src/androidMain/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/compose-android-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/compose-android-app/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to compose-android-app/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/compose-android-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/compose-android-app/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to compose-android-app/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/compose-android-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/compose-android-app/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from compose-android-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to compose-android-app/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/compose-android-app/src/main/res/values-night/themes.xml b/compose-android-app/src/androidMain/res/values-night/themes.xml similarity index 100% rename from compose-android-app/src/main/res/values-night/themes.xml rename to compose-android-app/src/androidMain/res/values-night/themes.xml diff --git a/compose-android-app/src/main/res/values/colors.xml b/compose-android-app/src/androidMain/res/values/colors.xml similarity index 100% rename from compose-android-app/src/main/res/values/colors.xml rename to compose-android-app/src/androidMain/res/values/colors.xml diff --git a/compose-android-app/src/main/res/values/developer-config.xml b/compose-android-app/src/androidMain/res/values/developer-config.xml similarity index 100% rename from compose-android-app/src/main/res/values/developer-config.xml rename to compose-android-app/src/androidMain/res/values/developer-config.xml diff --git a/compose-android-app/src/main/res/values/strings.xml b/compose-android-app/src/androidMain/res/values/strings.xml similarity index 100% rename from compose-android-app/src/main/res/values/strings.xml rename to compose-android-app/src/androidMain/res/values/strings.xml diff --git a/compose-android-app/src/main/res/values/themes.xml b/compose-android-app/src/androidMain/res/values/themes.xml similarity index 100% rename from compose-android-app/src/main/res/values/themes.xml rename to compose-android-app/src/androidMain/res/values/themes.xml diff --git a/compose-android-app/src/main/res/xml/backup_rules.xml b/compose-android-app/src/androidMain/res/xml/backup_rules.xml similarity index 100% rename from compose-android-app/src/main/res/xml/backup_rules.xml rename to compose-android-app/src/androidMain/res/xml/backup_rules.xml diff --git a/compose-android-app/src/main/res/xml/data_extraction_rules.xml b/compose-android-app/src/androidMain/res/xml/data_extraction_rules.xml similarity index 100% rename from compose-android-app/src/main/res/xml/data_extraction_rules.xml rename to compose-android-app/src/androidMain/res/xml/data_extraction_rules.xml diff --git a/compose-android-app/src/main/res/xml/network_security.xml b/compose-android-app/src/androidMain/res/xml/network_security.xml similarity index 100% rename from compose-android-app/src/main/res/xml/network_security.xml rename to compose-android-app/src/androidMain/res/xml/network_security.xml diff --git a/compose-common/build.gradle.kts b/compose-common/build.gradle.kts new file mode 100644 index 0000000..0b20dac --- /dev/null +++ b/compose-common/build.gradle.kts @@ -0,0 +1,62 @@ +import org.jetbrains.compose.ExperimentalComposeLibrary +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.androidLibrary) + alias(libs.plugins.jetbrainsCompose) +} + +kotlin { + + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + + androidTarget { + compilations.all { + kotlinOptions { + jvmTarget = "17" + } + } + } + + iosX64() + iosArm64() + iosSimulatorArm64() + + jvm() + + sourceSets { + commonMain.dependencies { + // put your Multiplatform dependencies here + } + } + + sourceSets { + commonMain.dependencies { + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + @OptIn(ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + implementation(projects.shared) + } + } +} + +android { + namespace = "com.example.myapplication.shared" + compileSdk = libs.versions.compileSdk.get().toInt() + + defaultConfig { + minSdk = libs.versions.minSdk.get().toInt() + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} diff --git a/compose-common/src/commonMain/kotlin/App.kt b/compose-common/src/commonMain/kotlin/App.kt new file mode 100644 index 0000000..2a0f34e --- /dev/null +++ b/compose-common/src/commonMain/kotlin/App.kt @@ -0,0 +1,38 @@ +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material.Button +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import org.jetbrains.compose.resources.ExperimentalResourceApi + +@OptIn(ExperimentalResourceApi::class) +@Composable +fun App() { + MaterialTheme { + var showContent by remember { mutableStateOf(false) } + val platform = remember { getPlatform() } + Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { + Button(onClick = { showContent = !showContent }) { + Text("Click me!") + } + AnimatedVisibility(showContent) { + Column( + Modifier.fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + // Web app stuck on it +// Image(painterResource(DrawableResource("compose-multiplatform.xml")), null) + Text("Compose: $platform") + } + } + } + } +} \ No newline at end of file diff --git a/compose-common/src/commonMain/resources/compose-multiplatform.xml b/compose-common/src/commonMain/resources/compose-multiplatform.xml new file mode 100644 index 0000000..d7bf795 --- /dev/null +++ b/compose-common/src/commonMain/resources/compose-multiplatform.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/compose-desktop-app/build.gradle.kts b/compose-desktop-app/build.gradle.kts new file mode 100644 index 0000000..27adfa7 --- /dev/null +++ b/compose-desktop-app/build.gradle.kts @@ -0,0 +1,31 @@ +import org.jetbrains.compose.desktop.application.dsl.TargetFormat + +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.jetbrainsCompose) +} + +kotlin { + + jvm("desktop") + + sourceSets { + val desktopMain by getting + desktopMain.dependencies { + implementation(projects.composeCommon) + implementation(compose.desktop.currentOs) + } + } +} + +compose.desktop { + application { + mainClass = "MainKt" + + nativeDistributions { + targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) + packageName = "io.architecture.playground" + packageVersion = "1.0.0" + } + } +} \ No newline at end of file diff --git a/compose-desktop-app/src/desktopMain/kotlin/main.kt b/compose-desktop-app/src/desktopMain/kotlin/main.kt new file mode 100644 index 0000000..517f588 --- /dev/null +++ b/compose-desktop-app/src/desktopMain/kotlin/main.kt @@ -0,0 +1,16 @@ +import androidx.compose.desktop.ui.tooling.preview.Preview +import androidx.compose.runtime.Composable +import androidx.compose.ui.window.Window +import androidx.compose.ui.window.application + +fun main() = application { + Window(onCloseRequest = ::exitApplication, title = "KotlinProject") { + App() + } +} + +@Preview +@Composable +fun AppDesktopPreview() { + App() +} \ No newline at end of file diff --git a/compose-ios-app/build.gradle.kts b/compose-ios-app/build.gradle.kts new file mode 100644 index 0000000..8afeee1 --- /dev/null +++ b/compose-ios-app/build.gradle.kts @@ -0,0 +1,34 @@ +import org.jetbrains.compose.ExperimentalComposeLibrary + +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.jetbrainsCompose) +} + +kotlin { + + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64() + ).forEach { iosTarget -> + iosTarget.binaries.framework { + baseName = "compose-ios-app" + isStatic = true + } + } + + sourceSets { + commonMain.dependencies { + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + @OptIn(ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + implementation(projects.shared) + implementation(projects.composeCommon) + implementation(projects.shared) + } + } +} \ No newline at end of file diff --git a/compose-ios-app/compose-ios-app.xcodeproj/project.pbxproj b/compose-ios-app/compose-ios-app.xcodeproj/project.pbxproj new file mode 100644 index 0000000..9e9f159 --- /dev/null +++ b/compose-ios-app/compose-ios-app.xcodeproj/project.pbxproj @@ -0,0 +1,393 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; }; + 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; }; + 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; }; + 7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 7555FFB4242A642300829871 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + 2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; + 7555FF7B242A565900829871 /* compose-ios-app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "compose-ios-app.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 7555FF78242A565900829871 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 058557D7273AAEEB004C7B11 /* Preview Content */ = { + isa = PBXGroup; + children = ( + 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */, + ); + path = "Preview Content"; + sourceTree = ""; + }; + 7555FF72242A565900829871 = { + isa = PBXGroup; + children = ( + 7555FF7D242A565900829871 /* compose-ios-app */, + 7555FF7C242A565900829871 /* Products */, + 7555FFB0242A642200829871 /* Frameworks */, + ); + sourceTree = ""; + }; + 7555FF7C242A565900829871 /* Products */ = { + isa = PBXGroup; + children = ( + 7555FF7B242A565900829871 /* compose-ios-app.app */, + ); + name = Products; + sourceTree = ""; + }; + 7555FF7D242A565900829871 /* compose-ios-app */ = { + isa = PBXGroup; + children = ( + 058557BA273AAA24004C7B11 /* Assets.xcassets */, + 7555FF82242A565900829871 /* ContentView.swift */, + 7555FF8C242A565B00829871 /* Info.plist */, + 2152FB032600AC8F00CF470E /* iOSApp.swift */, + 058557D7273AAEEB004C7B11 /* Preview Content */, + ); + path = "compose-ios-app"; + sourceTree = ""; + }; + 7555FFB0242A642200829871 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 7555FF7A242A565900829871 /* compose-ios-app */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "compose-ios-app" */; + buildPhases = ( + 7555FFB5242A651A00829871 /* ShellScript */, + 7555FF77242A565900829871 /* Sources */, + 7555FF78242A565900829871 /* Frameworks */, + 7555FF79242A565900829871 /* Resources */, + 7555FFB4242A642300829871 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "compose-ios-app"; + productName = "compose-ios-app"; + productReference = 7555FF7B242A565900829871 /* compose-ios-app.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 7555FF73242A565900829871 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1130; + LastUpgradeCheck = 1130; + ORGANIZATIONNAME = orgName; + TargetAttributes = { + 7555FF7A242A565900829871 = { + CreatedOnToolsVersion = 11.3.1; + }; + }; + }; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "compose-ios-app" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 7555FF72242A565900829871; + productRefGroup = 7555FF7C242A565900829871 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 7555FF7A242A565900829871 /* compose-ios-app */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 7555FF79242A565900829871 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */, + 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 7555FFB5242A651A00829871 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 7555FF77242A565900829871 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */, + 7555FF83242A565900829871 /* ContentView.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 7555FFA3242A565B00829871 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.1; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 7555FFA4242A565B00829871 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.1; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 7555FFA6242A565B00829871 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"compose-ios-app/Preview Content\""; + DEVELOPMENT_TEAM = F4479B46B2; + ENABLE_PREVIEWS = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ); + INFOPLIST_FILE = "compose-ios-app/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-framework", + shared, + ); + PRODUCT_BUNDLE_IDENTIFIER = "orgIdentifier.compose-ios-app"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 7555FFA7242A565B00829871 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"compose-ios-app/Preview Content\""; + DEVELOPMENT_TEAM = F4479B46B2; + ENABLE_PREVIEWS = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ); + INFOPLIST_FILE = "compose-ios-app/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-framework", + shared, + ); + PRODUCT_BUNDLE_IDENTIFIER = "orgIdentifier.compose-ios-app"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 7555FF76242A565900829871 /* Build configuration list for PBXProject "compose-ios-app" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7555FFA3242A565B00829871 /* Debug */, + 7555FFA4242A565B00829871 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "compose-ios-app" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7555FFA6242A565B00829871 /* Debug */, + 7555FFA7242A565B00829871 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 7555FF73242A565900829871 /* Project object */; +} diff --git a/compose-ios-app/compose-ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/compose-ios-app/compose-ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/compose-ios-app/compose-ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/compose-ios-app/compose-ios-app/Assets.xcassets/AccentColor.colorset/Contents.json b/compose-ios-app/compose-ios-app/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..ee7e3ca --- /dev/null +++ b/compose-ios-app/compose-ios-app/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/compose-ios-app/compose-ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json b/compose-ios-app/compose-ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..fb88a39 --- /dev/null +++ b/compose-ios-app/compose-ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/compose-ios-app/compose-ios-app/Assets.xcassets/Contents.json b/compose-ios-app/compose-ios-app/Assets.xcassets/Contents.json new file mode 100644 index 0000000..4aa7c53 --- /dev/null +++ b/compose-ios-app/compose-ios-app/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/compose-ios-app/compose-ios-app/ContentView.swift b/compose-ios-app/compose-ios-app/ContentView.swift new file mode 100644 index 0000000..61402af --- /dev/null +++ b/compose-ios-app/compose-ios-app/ContentView.swift @@ -0,0 +1,16 @@ +import SwiftUI +import shared + +struct ContentView: View { + let greet = "пидор" + + var body: some View { + Text(greet) + } +} + +struct ContentView_Previews: PreviewProvider { + static var previews: some View { + ContentView() + } +} \ No newline at end of file diff --git a/compose-ios-app/compose-ios-app/Info.plist b/compose-ios-app/compose-ios-app/Info.plist new file mode 100644 index 0000000..8044709 --- /dev/null +++ b/compose-ios-app/compose-ios-app/Info.plist @@ -0,0 +1,48 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UILaunchScreen + + + \ No newline at end of file diff --git a/compose-ios-app/compose-ios-app/Preview Content/Preview Assets.xcassets/Contents.json b/compose-ios-app/compose-ios-app/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 0000000..4aa7c53 --- /dev/null +++ b/compose-ios-app/compose-ios-app/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/compose-ios-app/compose-ios-app/iOSApp.swift b/compose-ios-app/compose-ios-app/iOSApp.swift new file mode 100644 index 0000000..0648e86 --- /dev/null +++ b/compose-ios-app/compose-ios-app/iOSApp.swift @@ -0,0 +1,10 @@ +import SwiftUI + +@main +struct iOSApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} \ No newline at end of file diff --git a/compose-web-app/build.gradle.kts b/compose-web-app/build.gradle.kts new file mode 100644 index 0000000..7c69b80 --- /dev/null +++ b/compose-web-app/build.gradle.kts @@ -0,0 +1,51 @@ +import org.jetbrains.compose.ExperimentalComposeLibrary +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig + +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.jetbrainsCompose) +} + +kotlin { + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + moduleName = "compose-web-app" + binaries.executable() + browser { + commonWebpackConfig { + outputFileName = "composeApp.js" + devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply { + // Uncomment and configure this if you want to open a browser different from the system default + // open = mapOf( + // "app" to mapOf( + // "name" to "google chrome" + // ) + // ) + } + } + } + + // Uncomment the next line to apply Binaryen and get optimized wasm binaries + // applyBinaryen() + } + + sourceSets { + val wasmJsTest by getting + val wasmJsMain by getting { + dependencies { + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + @OptIn(ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + implementation(projects.composeCommon) + } + } + } +} + +compose.experimental { + web.application {} +} \ No newline at end of file diff --git a/compose-web-app/src/wasmJsMain/kotlin/main.kt b/compose-web-app/src/wasmJsMain/kotlin/main.kt new file mode 100644 index 0000000..b9c0f64 --- /dev/null +++ b/compose-web-app/src/wasmJsMain/kotlin/main.kt @@ -0,0 +1,7 @@ +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.window.CanvasBasedWindow + +@OptIn(ExperimentalComposeUiApi::class) +fun main() { + CanvasBasedWindow(canvasElementId = "ComposeTarget") { App() } +} \ No newline at end of file diff --git a/compose-web-app/src/wasmJsMain/resources/index.html b/compose-web-app/src/wasmJsMain/resources/index.html new file mode 100644 index 0000000..9ba000f --- /dev/null +++ b/compose-web-app/src/wasmJsMain/resources/index.html @@ -0,0 +1,12 @@ + + + + + Compose App + + + + + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ec58d92..353ecc4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,6 @@ # Project-wide Gradle settings. +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* # any settings specified in this file. @@ -6,35 +8,43 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M" # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects org.gradle.parallel=true -# Enable configuration caching between builds. -org.gradle.configuration-cache=true # This option is set because of https://github.com/google/play-services-plugins/issues/246 # to generate the Configuration Cache regardless of incompatible tasks. # See https://github.com/android/nowinandroid/issues/1022 before using it. org.gradle.configuration-cache.problems=warn + + # Disable build features that are enabled by default, # https://developer.android.com/build/releases/gradle-plugin#default-changes android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true + +#Compose +org.jetbrains.compose.experimental.wasm.enabled=true + +#MPP +kotlin.mpp.androidSourceSetLayoutVersion=2 +kotlin.mpp.enableCInteropCommonization=true + +#Development +development=true # TODO TOKEN EXPOSE MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1Ijoidml0YWxpeXN0b3lhbm92IiwiYSI6ImNscno0cXQyOTFuZXgyam82ZjA5NXFhdTAifQ.aEWDAnLIYfLJuwq5fyUKlg diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0a647f2..3fc2c9a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ kotlinCompilerExtensionVersion = "1.5.7" jvmTarget = "1.8" # Plugins -composePlugin = "1.5.12" +composePlugin = "1.6.0-rc03" geojsonVersion = "0.2.1" kotlinxSerializationJsonVersion = "1.6.3" kotlinxSerializationProtobufVersion = "1.6.3" @@ -167,6 +167,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-serialize = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } modulegraph = { id = "dev.iurysouza.modulegraph", version.ref = "modulegraphMermaid" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" } # Common kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock new file mode 100644 index 0000000..24530bb --- /dev/null +++ b/kotlin-js-store/yarn.lock @@ -0,0 +1,2866 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@colors/colors@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" + integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== + +"@discoveryjs/json-ext@^0.5.0": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + +"@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" + integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== + +"@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/source-map@^0.3.3": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91" + integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": + version "1.4.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.20", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.22" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c" + integrity sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@leichtgewicht/ip-codec@^2.0.1": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" + integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== + +"@socket.io/component-emitter@~3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" + integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== + +"@types/body-parser@*": + version "1.19.5" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4" + integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/bonjour@^3.5.9": + 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.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" "*" + +"@types/connect@*": + version "3.4.38" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858" + integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug== + dependencies: + "@types/node" "*" + +"@types/cookie@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" + integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== + +"@types/cors@^2.8.12": + version "2.8.17" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.17.tgz#5d718a5e494a8166f569d986794e49c48b216b2b" + integrity sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA== + dependencies: + "@types/node" "*" + +"@types/eslint-scope@^3.7.3": + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "8.56.2" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.2.tgz#1c72a9b794aa26a8b94ad26d5b9aa51c8a6384bb" + integrity sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^1.0.0": + 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.43" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz#10d8444be560cb789c4735aea5eac6e5af45df54" + integrity sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" + +"@types/express@*", "@types/express@^4.17.13": + 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.4" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f" + integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA== + +"@types/http-proxy@^1.17.8": + version "1.17.14" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.14.tgz#57f8ccaa1c1c3780644f8a94f9c6b5000b5e2eec" + integrity sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w== + dependencies: + "@types/node" "*" + +"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== + +"@types/mime@*": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45" + integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw== + +"@types/mime@^1": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690" + integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w== + +"@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@*", "@types/node@>=10.0.0": + version "20.11.20" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659" + integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg== + dependencies: + undici-types "~5.26.4" + +"@types/qs@*": + version "6.9.11" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda" + integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ== + +"@types/range-parser@*": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" + integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== + +"@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/send@*": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" + integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/serve-index@^1.9.1": + 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": + version "1.15.5" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033" + integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ== + dependencies: + "@types/http-errors" "*" + "@types/mime" "*" + "@types/node" "*" + +"@types/sockjs@^0.3.33": + 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" "*" + +"@types/ws@^8.5.1": + 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.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== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + +"@webassemblyjs/floating-point-hex-parser@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== + +"@webassemblyjs/helper-api-error@1.11.6": + version "1.11.6" + 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-numbers@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.6": + version "1.11.6" + 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== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + +"@webassemblyjs/ieee754@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.6": + version "1.11.6" + 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== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@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-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== + 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/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== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@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== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^2.1.0": + 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": + 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": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + 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" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== + dependencies: + mime-types "~2.1.34" + negotiator "0.6.3" + +acorn-import-assertions@^1.7.6: + 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== + +acorn@^8.7.1, acorn@^8.8.2: + version "8.11.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv-keywords@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + +ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.0, ajv@^8.9.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-html-community@^0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +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" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64id@2.0.0, base64id@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" + integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== + +batch@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== + dependencies: + bytes "3.1.2" + content-type "~1.0.4" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.1" + type-is "~1.6.18" + unpipe "1.0.0" + +body-parser@^1.19.0: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== + dependencies: + bytes "3.1.2" + content-type "~1.0.5" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.2" + type-is "~1.6.18" + unpipe "1.0.0" + +bonjour-service@^1.0.11: + version "1.2.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02" + integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw== + dependencies: + 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" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + +braces@^3.0.2, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-stdout@1.3.1: + version "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.23.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" + integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== + dependencies: + 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: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== + +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + +call-bind@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + +camelcase@^6.0.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + +caniuse-lite@^1.0.30001587: + version "1.0.30001589" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz#7ad6dba4c9bf6561aec8291976402339dc157dfb" + integrity sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg== + +chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chokidar@3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + 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" + +chokidar@^3.5.1, chokidar@^3.5.3: + 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" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colorette@^2.0.10, colorette@^2.0.14: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== + +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +compressible@~2.0.16: + version "2.0.18" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== + dependencies: + mime-db ">= 1.43.0 < 2" + +compression@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== + dependencies: + accepts "~1.3.5" + bytes "3.0.0" + compressible "~2.0.16" + debug "2.6.9" + on-headers "~1.0.2" + 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" + integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== + +connect@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" + integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== + dependencies: + debug "2.6.9" + finalhandler "1.1.2" + parseurl "~1.3.3" + utils-merge "1.0.1" + +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== + dependencies: + safe-buffer "5.2.1" + +content-type@~1.0.4, content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== + +cookie@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" + integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== + +cookie@~0.4.1: + version "0.4.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" + integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cors@~2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + +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== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +custom-event@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" + integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg== + +date-format@^4.0.14: + version "4.0.14" + resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400" + integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg== + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@4.3.4, debug@^4.1.0, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +decamelize@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" + integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== + +default-gateway@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" + integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== + dependencies: + execa "^5.0.0" + +define-data-property@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + +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== + +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== + +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +di@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" + integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA== + +diff@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + +dns-packet@^5.2.2: + version "5.6.1" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f" + integrity sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw== + dependencies: + "@leichtgewicht/ip-codec" "^2.0.1" + +dom-serialize@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" + integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ== + dependencies: + custom-event "~1.0.0" + ent "~2.2.0" + extend "^3.0.0" + void-elements "^2.0.0" + +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.668: + version "1.4.680" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.680.tgz#18a30d3f557993eda2d5b1e21a06c4d51875392f" + integrity sha512-4nToZ5jlPO14W82NkF32wyjhYqQByVaDmLy4J2/tYcAbJfgO2TKJC780Az1V13gzq4l73CJ0yuyalpXvxXXD9A== + +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== + +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== + +engine.io-parser@~5.2.1: + version "5.2.2" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.2.tgz#37b48e2d23116919a3453738c5720455e64e1c49" + integrity sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw== + +engine.io@~6.5.2: + version "6.5.4" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.4.tgz#6822debf324e781add2254e912f8568508850cdc" + integrity sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg== + dependencies: + "@types/cookie" "^0.4.1" + "@types/cors" "^2.8.12" + "@types/node" ">=10.0.0" + accepts "~1.3.4" + base64id "2.0.0" + cookie "~0.4.1" + cors "~2.8.5" + debug "~4.3.1" + engine.io-parser "~5.2.1" + ws "~8.11.0" + +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== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +ent@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" + integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== + +envinfo@^7.7.3: + version "7.11.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.1.tgz#2ffef77591057081b0129a8fd8cf6118da1b94e1" + integrity sha512-8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg== + +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + +es-module-lexer@^1.2.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" + integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== + +escalade@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" + integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== + +escape-string-regexp@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== + +eventemitter3@^4.0.0: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +express@^4.17.3: + version "4.18.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== + dependencies: + accepts "~1.3.8" + array-flatten "1.1.1" + body-parser "1.20.1" + content-disposition "0.5.4" + content-type "~1.0.4" + cookie "0.5.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "2.0.0" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "1.2.0" + fresh "0.5.2" + http-errors "2.0.0" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "2.4.1" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.7" + qs "6.11.0" + range-parser "~1.2.1" + safe-buffer "5.2.1" + send "0.18.0" + serve-static "1.15.0" + setprototypeof "1.2.0" + statuses "2.0.1" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extend@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fastest-levenshtein@^1.0.12: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + +faye-websocket@^0.11.3: + version "0.11.4" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== + dependencies: + websocket-driver ">=0.5.1" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "2.4.1" + parseurl "~1.3.3" + statuses "2.0.1" + unpipe "~1.0.0" + +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== + +flatted@^3.2.7: + version "3.3.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== + +follow-redirects@^1.0.0: + version "1.15.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020" + integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw== + +format-util@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271" + integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg== + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +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" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.1.3, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob-to-regexp@^0.4.1: + version "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== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.1.3, glob@^7.1.7: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + 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" + +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: + 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== + +handle-thing@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-property-descriptors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + +has-proto@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +hasown@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" + integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== + dependencies: + function-bind "^1.1.2" + +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +hpack.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== + dependencies: + inherits "^2.0.1" + obuf "^1.0.0" + 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== + +http-deceiver@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== + +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" + +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + +http-parser-js@>=0.5.1: + version "0.5.8" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" + integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== + +http-proxy-middleware@^2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" + integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== + dependencies: + "@types/http-proxy" "^1.17.8" + http-proxy "^1.18.1" + is-glob "^4.0.1" + is-plain-obj "^3.0.0" + micromatch "^4.0.2" + +http-proxy@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +import-local@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== + +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== + +ipaddr.js@1.9.1: + version "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== + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-core-module@^2.13.0: + version "2.13.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" + integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== + 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-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-plain-obj@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + +is-plain-obj@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== + +is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-unicode-supported@^0.1.0: + version "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== + dependencies: + is-docker "^2.0.0" + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + +isbinaryfile@^4.0.8: + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== + +jest-worker@^27.4.5: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +js-yaml@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +json-parse-even-better-errors@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== + optionalDependencies: + graceful-fs "^4.1.6" + +karma-chrome-launcher@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz#eb9c95024f2d6dfbb3748d3415ac9b381906b9a9" + integrity sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q== + dependencies: + which "^1.2.1" + +karma-mocha@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-2.0.1.tgz#4b0254a18dfee71bdbe6188d9a6861bf86b0cd7d" + integrity sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ== + dependencies: + minimist "^1.2.3" + +karma-sourcemap-loader@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.4.0.tgz#b01d73f8f688f533bcc8f5d273d43458e13b5488" + integrity sha512-xCRL3/pmhAYF3I6qOrcn0uhbQevitc2DERMPH82FMnG+4WReoGcGFZb1pURf2a5apyrOHRdvD+O6K7NljqKHyA== + dependencies: + graceful-fs "^4.2.10" + +karma-webpack@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840" + integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA== + dependencies: + glob "^7.1.3" + minimatch "^3.0.4" + webpack-merge "^4.1.5" + +karma@6.4.2: + version "6.4.2" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.2.tgz#a983f874cee6f35990c4b2dcc3d274653714de8e" + integrity sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ== + dependencies: + "@colors/colors" "1.5.0" + body-parser "^1.19.0" + braces "^3.0.2" + chokidar "^3.5.1" + connect "^3.7.0" + di "^0.0.1" + dom-serialize "^2.2.1" + glob "^7.1.7" + graceful-fs "^4.2.6" + http-proxy "^1.18.1" + isbinaryfile "^4.0.8" + lodash "^4.17.21" + log4js "^6.4.1" + mime "^2.5.2" + minimatch "^3.0.4" + mkdirp "^0.5.5" + qjobs "^1.2.0" + range-parser "^1.2.1" + rimraf "^3.0.2" + socket.io "^4.4.1" + source-map "^0.6.1" + tmp "^0.2.1" + ua-parser-js "^0.7.30" + yargs "^16.1.1" + +kind-of@^6.0.2: + version "6.0.3" + 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: + 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== + dependencies: + picocolors "^1.0.0" + shell-quote "^1.8.1" + +loader-runner@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" + integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash@^4.17.15, lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-symbols@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + +log4js@^6.4.1: + version "6.9.1" + resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6" + integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g== + dependencies: + date-format "^4.0.14" + debug "^4.3.4" + flatted "^3.2.7" + rfdc "^1.3.0" + streamroller "^3.1.5" + +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== + dependencies: + fs-monkey "^1.0.4" + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== + +micromatch@^4.0.2: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mime@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +minimalistic-assert@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +minimatch@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== + 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== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.3, minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +mkdirp@^0.5.5: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + dependencies: + minimist "^1.2.6" + +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== + dependencies: + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.2.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" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +multicast-dns@^7.2.5: + version "7.2.5" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" + integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== + dependencies: + 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" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +node-forge@^1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== + +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" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +object-assign@^4: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + +object-inspect@^1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== + +obuf@^1.0.0, obuf@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== + +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== + dependencies: + ee-first "1.1.1" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + 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== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + 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== + dependencies: + "@types/retry" "0.12.0" + retry "^0.13.1" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +parseurl@~1.3.2, parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-exists@^4.0.0: + version "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" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +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" + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +proxy-addr@~2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +punycode@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + +qjobs@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" + integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== + +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +range-parser@^1.2.1, range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + +readable-stream@^2.0.1: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.6: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== + dependencies: + resolve "^1.20.0" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve@^1.20.0: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +retry@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== + +rfdc@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" + integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== + +rimraf@^3.0.0, 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== + dependencies: + glob "^7.1.3" + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + 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: + 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== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +schema-utils@^4.0.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== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.9.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.1.0" + +select-hose@^2.0.0: + version "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.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: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== + dependencies: + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "2.0.0" + mime "1.6.0" + ms "2.1.3" + on-finished "2.4.1" + range-parser "~1.2.1" + statuses "2.0.1" + +serialize-javascript@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + +serialize-javascript@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== + dependencies: + randombytes "^2.1.0" + +serve-index@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== + dependencies: + accepts "~1.3.4" + batch "0.6.1" + debug "2.6.9" + escape-html "~1.0.3" + http-errors "~1.6.2" + mime-types "~2.1.17" + parseurl "~1.3.2" + +serve-static@1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.18.0" + +set-function-length@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" + integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g== + dependencies: + define-data-property "^1.1.2" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.3" + gopd "^1.0.1" + has-property-descriptors "^1.0.1" + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +shell-quote@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" + integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== + +side-channel@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.5.tgz#9a84546599b48909fb6af1211708d23b1946221b" + integrity sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + +signal-exit@^3.0.3: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +socket.io-adapter@~2.5.2: + version "2.5.4" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.4.tgz#4fdb1358667f6d68f25343353bd99bd11ee41006" + integrity sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg== + dependencies: + debug "~4.3.4" + ws "~8.11.0" + +socket.io-parser@~4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83" + integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + +socket.io@^4.4.1: + version "4.7.4" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.4.tgz#2401a2d7101e4bdc64da80b140d5d8b6a8c7738b" + integrity sha512-DcotgfP1Zg9iP/dH9zvAQcWrE0TtbMVwXmlV4T4mqsvY+gw+LqUGPfx2AoVyRk0FLME+GQhufDMyacFmw7ksqw== + dependencies: + accepts "~1.3.4" + base64id "~2.0.0" + cors "~2.8.5" + debug "~4.3.2" + engine.io "~6.5.2" + socket.io-adapter "~2.5.2" + socket.io-parser "~4.2.4" + +sockjs@^0.3.24: + version "0.3.24" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" + integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== + dependencies: + faye-websocket "^0.11.3" + uuid "^8.3.2" + websocket-driver "^0.7.4" + +source-map-js@^1.0.2: + version "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== + dependencies: + abab "^2.0.6" + iconv-lite "^0.6.3" + source-map-js "^1.0.2" + +source-map-support@~0.5.20: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0, source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +spdy-transport@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== + dependencies: + debug "^4.1.0" + detect-node "^2.0.4" + hpack.js "^2.1.6" + obuf "^1.1.2" + readable-stream "^3.0.6" + wbuf "^1.7.3" + +spdy@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== + dependencies: + debug "^4.1.0" + handle-thing "^2.0.0" + http-deceiver "^1.2.7" + select-hose "^2.0.0" + spdy-transport "^3.0.0" + +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +"statuses@>= 1.4.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== + +streamroller@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff" + integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw== + dependencies: + date-format "^4.0.14" + debug "^4.3.4" + fs-extra "^8.1.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== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.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" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +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-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" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +supports-color@8.1.1, supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.1" + 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.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.20" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.1" + terser "^5.26.0" + +terser@^5.26.0: + version "5.27.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.27.2.tgz#577a362515ff5635f98ba149643793a3973ba77e" + integrity sha512-sHXmLSkImesJ4p5apTeT63DsV4Obe1s37qT8qvwHRmVxKTBH7Rv9Wr26VcAMmLbmk9UliiwK8z+657NyJHHy/w== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + +thunky@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== + +tmp@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + +type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + 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== + +ua-parser-js@^0.7.30: + version "0.7.37" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.37.tgz#e464e66dac2d33a7a1251d7d7a99d6157ec27832" + integrity sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA== + +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== + +update-browserslist-db@^1.0.13: + version "1.0.13" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" + integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== + +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +vary@^1, vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== + +void-elements@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" + integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== + +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== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + +wbuf@^1.1.0, wbuf@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== + 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== + 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" + colorette "^2.0.14" + commander "^10.0.1" + cross-spawn "^7.0.3" + envinfo "^7.7.3" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^3.1.1" + 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== + dependencies: + colorette "^2.0.10" + memfs "^3.4.3" + mime-types "^2.1.31" + 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" + ansi-html-community "^0.0.8" + bonjour-service "^1.0.11" + chokidar "^3.5.3" + 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" + 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" + serve-index "^1.9.1" + sockjs "^0.3.24" + spdy "^4.0.2" + webpack-dev-middleware "^5.3.1" + ws "^8.13.0" + +webpack-merge@^4.1.5: + version "4.2.2" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" + integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== + dependencies: + lodash "^4.17.15" + +webpack-merge@^5.7.3: + version "5.10.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" + integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== + dependencies: + clone-deep "^4.0.1" + flat "^5.0.2" + wildcard "^2.0.0" + +webpack-sources@^3.2.3: + version "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== + 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" + acorn "^8.7.1" + acorn-import-assertions "^1.7.6" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.13.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" + 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" + tapable "^2.1.1" + terser-webpack-plugin "^5.3.7" + watchpack "^2.4.0" + webpack-sources "^3.2.3" + +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== + dependencies: + http-parser-js ">=0.5.1" + safe-buffer ">=5.1.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== + +which@^1.2.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wildcard@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" + integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== + +workerpool@6.2.1: + version "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: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +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.16.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" + integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + +ws@~8.11.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" + integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs-unparser@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" + integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== + dependencies: + camelcase "^6.0.0" + decamelize "^4.0.0" + flat "^5.0.2" + is-plain-obj "^2.1.0" + +yargs@16.2.0, yargs@^16.1.1: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/settings.gradle.kts b/settings.gradle.kts index 53408f3..7d0649f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,14 +3,14 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { repositories { + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") google() - mavenCentral() gradlePluginPortal() + mavenCentral() } } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() mavenCentral() @@ -24,11 +24,17 @@ dependencyResolutionManagement { credentials.password = providers.gradleProperty("MAPBOX_DOWNLOADS_TOKEN").get() authentication.create("basic") } - + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } include(":ktor-server-app") +include(":shared") + +include(":compose-common") include(":compose-android-app") +include(":compose-desktop-app") +//include(":compose-ios-app") +include(":compose-web-app") include(":core:common") include(":core:model") diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts new file mode 100644 index 0000000..077894d --- /dev/null +++ b/shared/build.gradle.kts @@ -0,0 +1,52 @@ +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.androidLibrary) +} + +kotlin { + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + + androidTarget { + compilations.all { + kotlinOptions { + jvmTarget = "17" + } + } + } + + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64() + ).forEach { + it.binaries.framework { + baseName = "shared" + isStatic = true + } + } + + jvm() + + sourceSets { + commonMain.dependencies { + // put your Multiplatform dependencies here + } + } +} + +android { + namespace = "io.architecture.playground.shared" + compileSdk = libs.versions.compileSdk.get().toInt() + defaultConfig { + minSdk = libs.versions.minSdk.get().toInt() + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} diff --git a/shared/src/androidMain/kotlin/Platform.android.kt b/shared/src/androidMain/kotlin/Platform.android.kt new file mode 100644 index 0000000..4f3ea05 --- /dev/null +++ b/shared/src/androidMain/kotlin/Platform.android.kt @@ -0,0 +1,7 @@ +import android.os.Build + +class AndroidPlatform : Platform { + override val name: String = "Android ${Build.VERSION.SDK_INT}" +} + +actual fun getPlatform(): Platform = AndroidPlatform() \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/Platform.kt b/shared/src/commonMain/kotlin/Platform.kt new file mode 100644 index 0000000..87ca3ff --- /dev/null +++ b/shared/src/commonMain/kotlin/Platform.kt @@ -0,0 +1,5 @@ +interface Platform { + val name: String +} + +expect fun getPlatform(): Platform \ No newline at end of file diff --git a/shared/src/iosMain/kotlin/Platform.ios.kt b/shared/src/iosMain/kotlin/Platform.ios.kt new file mode 100644 index 0000000..5cef987 --- /dev/null +++ b/shared/src/iosMain/kotlin/Platform.ios.kt @@ -0,0 +1,7 @@ +import platform.UIKit.UIDevice + +class IOSPlatform: Platform { + override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion +} + +actual fun getPlatform(): Platform = IOSPlatform() \ No newline at end of file diff --git a/shared/src/jvmMain/kotlin/Platform.jvm.kt b/shared/src/jvmMain/kotlin/Platform.jvm.kt new file mode 100644 index 0000000..f5e7e49 --- /dev/null +++ b/shared/src/jvmMain/kotlin/Platform.jvm.kt @@ -0,0 +1,5 @@ +class JVMPlatform: Platform { + override val name: String = "Java ${System.getProperty("java.version")}" +} + +actual fun getPlatform(): Platform = JVMPlatform() \ No newline at end of file diff --git a/shared/src/wasmJsMain/kotlin/Platform.wasmJs.kt b/shared/src/wasmJsMain/kotlin/Platform.wasmJs.kt new file mode 100644 index 0000000..57b2e11 --- /dev/null +++ b/shared/src/wasmJsMain/kotlin/Platform.wasmJs.kt @@ -0,0 +1,5 @@ +class WasmPlatform: Platform { + override val name: String = "Web with Kotlin/Wasm" +} + +actual fun getPlatform(): Platform = WasmPlatform() \ No newline at end of file From b64fef0f03943ce48827c2e32957b5df8517d832 Mon Sep 17 00:00:00 2001 From: dev Date: Sat, 24 Feb 2024 20:58:53 +0200 Subject: [PATCH 03/32] Configured shared Koin modules for desktop & android + created Koin app instance, as a Composable for all targets --- compose-android-app/build.gradle.kts | 4 -- .../io/architecture/playground/MapActivity.kt | 6 +-- .../playground/PlaygroundApplication.kt | 17 +------ compose-common/build.gradle.kts | 48 ++++++++++++------- compose-desktop-app/build.gradle.kts | 5 ++ .../src/desktopMain/kotlin/main.kt | 9 +++- .../compose-ios-app/ContentView.swift | 22 +++++---- compose-ios-app/compose-ios-app/iOSApp.swift | 16 ++++--- compose-web-app/build.gradle.kts | 5 +- compose-web-app/src/wasmJsMain/kotlin/main.kt | 9 +++- gradle/libs.versions.toml | 6 ++- shared/build.gradle.kts | 47 +++++++++++++++++- .../kotlin/AppKoinModule.android.kt | 15 ++++++ .../androidMain/kotlin/AppWrapper.android.kt | 3 ++ .../androidMain/kotlin/Platform.android.kt | 7 --- .../kotlin/PlatformKoinModule.android.kt | 11 +++++ .../src/commonMain/kotlin/App.kt | 12 +++-- shared/src/commonMain/kotlin/AppKoinModule.kt | 3 ++ shared/src/commonMain/kotlin/Platform.kt | 5 -- .../commonMain/kotlin/PlatformKoinModule.kt | 7 +++ .../resources/compose-multiplatform.xml | 0 .../src/iosMain/kotlin/AppKoinModule.ios.kt | 6 +++ .../iosMain/kotlin/ComposeUIController.ios.kt | 11 +++++ shared/src/iosMain/kotlin/Platform.ios.kt | 7 --- .../iosMain/kotlin/PlatformKoinModule.ios.kt | 12 +++++ .../src/jvmMain/kotlin/AppKoinModule.jvm.kt | 7 +++ shared/src/jvmMain/kotlin/Platform.jvm.kt | 5 -- .../jvmMain/kotlin/PlatformKoinModule.jvm.kt | 10 ++++ .../wasmJsMain/kotlin/AppKoinModule.wasmJs.kt | 9 ++++ .../src/wasmJsMain/kotlin/Platform.wasmJs.kt | 5 -- .../kotlin/PlatformKoinModule.wasmJs.kt | 11 +++++ 31 files changed, 243 insertions(+), 97 deletions(-) create mode 100644 shared/src/androidMain/kotlin/AppKoinModule.android.kt create mode 100644 shared/src/androidMain/kotlin/AppWrapper.android.kt delete mode 100644 shared/src/androidMain/kotlin/Platform.android.kt create mode 100644 shared/src/androidMain/kotlin/PlatformKoinModule.android.kt rename {compose-common => shared}/src/commonMain/kotlin/App.kt (75%) create mode 100644 shared/src/commonMain/kotlin/AppKoinModule.kt delete mode 100644 shared/src/commonMain/kotlin/Platform.kt create mode 100644 shared/src/commonMain/kotlin/PlatformKoinModule.kt rename {compose-common => shared}/src/commonMain/resources/compose-multiplatform.xml (100%) create mode 100644 shared/src/iosMain/kotlin/AppKoinModule.ios.kt create mode 100644 shared/src/iosMain/kotlin/ComposeUIController.ios.kt delete mode 100644 shared/src/iosMain/kotlin/Platform.ios.kt create mode 100644 shared/src/iosMain/kotlin/PlatformKoinModule.ios.kt create mode 100644 shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt delete mode 100644 shared/src/jvmMain/kotlin/Platform.jvm.kt create mode 100644 shared/src/jvmMain/kotlin/PlatformKoinModule.jvm.kt create mode 100644 shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt delete mode 100644 shared/src/wasmJsMain/kotlin/Platform.wasmJs.kt create mode 100644 shared/src/wasmJsMain/kotlin/PlatformKoinModule.wasmJs.kt diff --git a/compose-android-app/build.gradle.kts b/compose-android-app/build.gradle.kts index 66da0b8..039838a 100644 --- a/compose-android-app/build.gradle.kts +++ b/compose-android-app/build.gradle.kts @@ -13,7 +13,6 @@ kotlin { val androidMain by getting { dependencies { implementation(projects.shared) - implementation(projects.composeCommon) } } } @@ -74,10 +73,7 @@ android { } dependencies { - implementation(projects.core.di) implementation(projects.core.domain) - implementation(projects.core.runtime.configuration) - implementation(projects.core.database.imp.room) implementation(projects.feature.map) diff --git a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt index 13388ca..395a5ca 100644 --- a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt +++ b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt @@ -1,12 +1,11 @@ package io.architecture.playground +import AppWrapper import android.content.Intent import android.os.Build import android.os.Bundle -import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import getPlatform import io.architecture.map.MapScreen import org.koin.compose.KoinContext @@ -15,11 +14,10 @@ class MapActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { // TODO Implement Splash screen API + user data fetching super.onCreate(savedInstanceState) - Toast.makeText(this, getPlatform().name, Toast.LENGTH_LONG).show() - setContent { KoinContext { MapScreen() +// AppWrapper() } } diff --git a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt index 97ffc37..c613dc2 100644 --- a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt +++ b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt @@ -1,13 +1,7 @@ package io.architecture.playground import android.app.Application -import android.util.Log -import io.architecture.core.di.coreKoinModules -import io.architecture.core.runtime.configuration.WebsocketRuntimeConfiguration -import io.architecture.database.imp.room.di.roomDaoModule -import io.architecture.database.imp.room.di.roomDatabaseModule -import io.architecture.map.featureMapModule -import org.koin.android.ext.android.inject +import appModule import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidLogger import org.koin.core.annotation.KoinExperimentalAPI @@ -24,12 +18,7 @@ class PlaygroundApplication : Application() { if (BuildConfig.DEBUG) setupCoroutineDebugMode() val modules = lazyModule { - includes( - coreKoinModules, - roomDaoModule, - roomDatabaseModule, - featureMapModule - ) + includes(appModule) } startKoin { @@ -41,8 +30,6 @@ class PlaygroundApplication : Application() { val koin = KoinPlatform.getKoin() koin.runOnKoinStarted { _ -> - val runtimeConfig: WebsocketRuntimeConfiguration by inject() - Log.d("RUNTIME_CONFIG", "Runtime configuration -> $runtimeConfig") super.onCreate() } } diff --git a/compose-common/build.gradle.kts b/compose-common/build.gradle.kts index 0b20dac..b475e8c 100644 --- a/compose-common/build.gradle.kts +++ b/compose-common/build.gradle.kts @@ -22,33 +22,47 @@ kotlin { } } - iosX64() - iosArm64() - iosSimulatorArm64() + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64() + ).forEach { + it.binaries.framework { + baseName = "shared" + isStatic = true + } + } jvm() sourceSets { - commonMain.dependencies { - // put your Multiplatform dependencies here - } - } + val commonMain by getting { + dependencies { + implementation(libs.koin.core) + implementation(libs.koin.mp.compose) - sourceSets { - commonMain.dependencies { - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material) - implementation(compose.ui) - @OptIn(ExperimentalComposeLibrary::class) - implementation(compose.components.resources) - implementation(projects.shared) + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + @OptIn(ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + } + } + val iosX64Main by getting + val iosArm64Main by getting + val iosSimulatorArm64Main by getting + val iosMain by creating { + dependsOn(commonMain) + iosX64Main.dependsOn(this) + iosArm64Main.dependsOn(this) + iosSimulatorArm64Main.dependsOn(this) } } } android { - namespace = "com.example.myapplication.shared" + namespace = "io.architecture.playground.compose.common" compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { diff --git a/compose-desktop-app/build.gradle.kts b/compose-desktop-app/build.gradle.kts index 27adfa7..b1b9fea 100644 --- a/compose-desktop-app/build.gradle.kts +++ b/compose-desktop-app/build.gradle.kts @@ -14,6 +14,11 @@ kotlin { desktopMain.dependencies { implementation(projects.composeCommon) implementation(compose.desktop.currentOs) + implementation(projects.shared) + + // Koin + implementation(libs.koin.core.coroutine) + implementation(libs.koin.mp.compose) } } } diff --git a/compose-desktop-app/src/desktopMain/kotlin/main.kt b/compose-desktop-app/src/desktopMain/kotlin/main.kt index 517f588..3de8067 100644 --- a/compose-desktop-app/src/desktopMain/kotlin/main.kt +++ b/compose-desktop-app/src/desktopMain/kotlin/main.kt @@ -2,15 +2,20 @@ import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.runtime.Composable import androidx.compose.ui.window.Window import androidx.compose.ui.window.application +import org.koin.compose.KoinApplication fun main() = application { Window(onCloseRequest = ::exitApplication, title = "KotlinProject") { - App() + KoinApplication(application = { + modules(appModule) + }) { + AppContainer() + } } } @Preview @Composable fun AppDesktopPreview() { - App() + AppContainer() } \ No newline at end of file diff --git a/compose-ios-app/compose-ios-app/ContentView.swift b/compose-ios-app/compose-ios-app/ContentView.swift index 61402af..e6f8023 100644 --- a/compose-ios-app/compose-ios-app/ContentView.swift +++ b/compose-ios-app/compose-ios-app/ContentView.swift @@ -1,16 +1,18 @@ +import UIKit import SwiftUI import shared -struct ContentView: View { - let greet = "пидор" +struct ComposeView: UIViewControllerRepresentable { + func makeUIViewController(context: Context) -> UIViewController { + ComposeUIController_iosKt.controller() + } - var body: some View { - Text(greet) - } + func updateUIViewController(_ uiViewController: UIViewController, context: Context) {} } -struct ContentView_Previews: PreviewProvider { - static var previews: some View { - ContentView() - } -} \ No newline at end of file +struct ContentView: View { + var body: some View { + ComposeView() + .ignoresSafeArea(.all, edges: .bottom) // Compose has own keyboard handler + } +} diff --git a/compose-ios-app/compose-ios-app/iOSApp.swift b/compose-ios-app/compose-ios-app/iOSApp.swift index 0648e86..568d1e0 100644 --- a/compose-ios-app/compose-ios-app/iOSApp.swift +++ b/compose-ios-app/compose-ios-app/iOSApp.swift @@ -2,9 +2,13 @@ import SwiftUI @main struct iOSApp: App { - var body: some Scene { - WindowGroup { - ContentView() - } - } -} \ No newline at end of file + + var body: some Scene { + WindowGroup { + ZStack { + Color.white.ignoresSafeArea(.all) // status bar color + ContentView() + }.preferredColorScheme(.light) + } + } +} diff --git a/compose-web-app/build.gradle.kts b/compose-web-app/build.gradle.kts index 7c69b80..42c3d4c 100644 --- a/compose-web-app/build.gradle.kts +++ b/compose-web-app/build.gradle.kts @@ -40,7 +40,10 @@ kotlin { implementation(compose.ui) @OptIn(ExperimentalComposeLibrary::class) implementation(compose.components.resources) - implementation(projects.composeCommon) + implementation(projects.shared) + + // Koin + implementation(libs.koin.mp.compose) } } } diff --git a/compose-web-app/src/wasmJsMain/kotlin/main.kt b/compose-web-app/src/wasmJsMain/kotlin/main.kt index b9c0f64..2ac15b4 100644 --- a/compose-web-app/src/wasmJsMain/kotlin/main.kt +++ b/compose-web-app/src/wasmJsMain/kotlin/main.kt @@ -1,7 +1,14 @@ import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.window.CanvasBasedWindow +import org.koin.compose.KoinApplication @OptIn(ExperimentalComposeUiApi::class) fun main() { - CanvasBasedWindow(canvasElementId = "ComposeTarget") { App() } + CanvasBasedWindow(canvasElementId = "ComposeTarget") { + KoinApplication(application = { + modules(platformModule) + }) { + AppContainer() + } + } } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3fc2c9a..6fe6946 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ kotlinCompilerExtensionVersion = "1.5.7" jvmTarget = "1.8" # Plugins -composePlugin = "1.6.0-rc03" +composePlugin = "1.6.0-beta02" geojsonVersion = "0.2.1" kotlinxSerializationJsonVersion = "1.6.3" kotlinxSerializationProtobufVersion = "1.6.3" @@ -60,7 +60,7 @@ okhttpVersion = "4.12.0" modulegraphMermaid = "0.5.0" ksp = "1.9.21-1.0.16" -koinCore = "3.5.3" +koinCore = "3.6.0-wasm-alpha2" koinAnnotations = "1.3.1" [libraries] @@ -93,6 +93,8 @@ koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koinC koin-core-coroutine = { group = "io.insert-koin", name = "koin-core-coroutines", version.ref = "koinCore" } koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koinCore" } koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koinCore" } +# TODO naming +koin-mp-compose = { group = "io.insert-koin", name = "koin-compose", version.ref = "koinCore" } koin-annotations = { group = "io.insert-koin", name = "koin-annotations", version.ref = "koinAnnotations" } koin-ksp-compiler = { group = "io.insert-koin", name = "koin-ksp-compiler", version.ref = "koinAnnotations" } koin-test = { group = "io.insert-koin", name = "koin-test", version.ref = "koinCore" } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 077894d..9b30a7a 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -1,8 +1,10 @@ +import org.jetbrains.compose.ExperimentalComposeLibrary import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) + alias(libs.plugins.jetbrainsCompose) } kotlin { @@ -33,8 +35,49 @@ kotlin { jvm() sourceSets { - commonMain.dependencies { - // put your Multiplatform dependencies here + val androidMain by getting { + dependencies { + implementation(projects.core.di) + implementation(projects.core.database.imp.room) + + implementation(projects.feature.map) + } + } + val commonMain by getting { + dependencies { + implementation(libs.koin.core) + implementation(libs.koin.test) + implementation(libs.koin.mp.compose) + + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + @OptIn(ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + } + } + val iosX64Main by getting + val iosArm64Main by getting + val iosSimulatorArm64Main by getting + val iosMain by creating { + dependsOn(commonMain) + iosX64Main.dependsOn(this) + iosArm64Main.dependsOn(this) + iosSimulatorArm64Main.dependsOn(this) + + dependencies { + implementation(libs.koin.mp.compose) + } + } + val jvmMain by getting { + dependencies { + implementation(projects.core.di) + } + } + val wasmJsMain by getting { + dependencies { + } } } } diff --git a/shared/src/androidMain/kotlin/AppKoinModule.android.kt b/shared/src/androidMain/kotlin/AppKoinModule.android.kt new file mode 100644 index 0000000..773a733 --- /dev/null +++ b/shared/src/androidMain/kotlin/AppKoinModule.android.kt @@ -0,0 +1,15 @@ +import io.architecture.core.di.coreKoinModules +import io.architecture.database.imp.room.di.roomDaoModule +import io.architecture.database.imp.room.di.roomDatabaseModule +import io.architecture.map.featureMapModule +import org.koin.dsl.module + +actual val appModule = module { + includes( + coreKoinModules, + platformModule, + roomDaoModule, + roomDatabaseModule, + featureMapModule + ) +} \ No newline at end of file diff --git a/shared/src/androidMain/kotlin/AppWrapper.android.kt b/shared/src/androidMain/kotlin/AppWrapper.android.kt new file mode 100644 index 0000000..5b5e324 --- /dev/null +++ b/shared/src/androidMain/kotlin/AppWrapper.android.kt @@ -0,0 +1,3 @@ +import androidx.compose.runtime.Composable + +@Composable fun AppWrapper() = AppContainer() \ No newline at end of file diff --git a/shared/src/androidMain/kotlin/Platform.android.kt b/shared/src/androidMain/kotlin/Platform.android.kt deleted file mode 100644 index 4f3ea05..0000000 --- a/shared/src/androidMain/kotlin/Platform.android.kt +++ /dev/null @@ -1,7 +0,0 @@ -import android.os.Build - -class AndroidPlatform : Platform { - override val name: String = "Android ${Build.VERSION.SDK_INT}" -} - -actual fun getPlatform(): Platform = AndroidPlatform() \ No newline at end of file diff --git a/shared/src/androidMain/kotlin/PlatformKoinModule.android.kt b/shared/src/androidMain/kotlin/PlatformKoinModule.android.kt new file mode 100644 index 0000000..5e0fc4c --- /dev/null +++ b/shared/src/androidMain/kotlin/PlatformKoinModule.android.kt @@ -0,0 +1,11 @@ +import android.os.Build +import org.koin.core.module.Module +import org.koin.dsl.module + +class AndroidPlatform : Platform { + override val name: String = "Android ${Build.VERSION.SDK_INT}" +} + +actual val platformModule: Module = module { + single { AndroidPlatform() } +} \ No newline at end of file diff --git a/compose-common/src/commonMain/kotlin/App.kt b/shared/src/commonMain/kotlin/App.kt similarity index 75% rename from compose-common/src/commonMain/kotlin/App.kt rename to shared/src/commonMain/kotlin/App.kt index 2a0f34e..d9423ab 100644 --- a/compose-common/src/commonMain/kotlin/App.kt +++ b/shared/src/commonMain/kotlin/App.kt @@ -1,4 +1,5 @@ import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material.Button @@ -11,14 +12,17 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.painterResource +import org.koin.compose.koinInject @OptIn(ExperimentalResourceApi::class) @Composable -fun App() { +fun AppContainer() { MaterialTheme { var showContent by remember { mutableStateOf(false) } - val platform = remember { getPlatform() } + val platform = koinInject() Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { Button(onClick = { showContent = !showContent }) { Text("Click me!") @@ -29,8 +33,8 @@ fun App() { horizontalAlignment = Alignment.CenterHorizontally ) { // Web app stuck on it -// Image(painterResource(DrawableResource("compose-multiplatform.xml")), null) - Text("Compose: $platform") + Image(painterResource(DrawableResource("compose-multiplatform.xml")), null) + Text("Compose: ${platform.name}") } } } diff --git a/shared/src/commonMain/kotlin/AppKoinModule.kt b/shared/src/commonMain/kotlin/AppKoinModule.kt new file mode 100644 index 0000000..fb17e62 --- /dev/null +++ b/shared/src/commonMain/kotlin/AppKoinModule.kt @@ -0,0 +1,3 @@ +import org.koin.core.module.Module + +expect val appModule: Module \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/Platform.kt b/shared/src/commonMain/kotlin/Platform.kt deleted file mode 100644 index 87ca3ff..0000000 --- a/shared/src/commonMain/kotlin/Platform.kt +++ /dev/null @@ -1,5 +0,0 @@ -interface Platform { - val name: String -} - -expect fun getPlatform(): Platform \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/PlatformKoinModule.kt b/shared/src/commonMain/kotlin/PlatformKoinModule.kt new file mode 100644 index 0000000..a2cafe5 --- /dev/null +++ b/shared/src/commonMain/kotlin/PlatformKoinModule.kt @@ -0,0 +1,7 @@ +import org.koin.core.module.Module + +interface Platform { + val name: String +} + +expect val platformModule: Module \ No newline at end of file diff --git a/compose-common/src/commonMain/resources/compose-multiplatform.xml b/shared/src/commonMain/resources/compose-multiplatform.xml similarity index 100% rename from compose-common/src/commonMain/resources/compose-multiplatform.xml rename to shared/src/commonMain/resources/compose-multiplatform.xml diff --git a/shared/src/iosMain/kotlin/AppKoinModule.ios.kt b/shared/src/iosMain/kotlin/AppKoinModule.ios.kt new file mode 100644 index 0000000..ee8f13a --- /dev/null +++ b/shared/src/iosMain/kotlin/AppKoinModule.ios.kt @@ -0,0 +1,6 @@ +import org.koin.core.module.Module +import org.koin.dsl.module + +actual val appModule: Module = module { + includes(platformModule) +} \ No newline at end of file diff --git a/shared/src/iosMain/kotlin/ComposeUIController.ios.kt b/shared/src/iosMain/kotlin/ComposeUIController.ios.kt new file mode 100644 index 0000000..1158411 --- /dev/null +++ b/shared/src/iosMain/kotlin/ComposeUIController.ios.kt @@ -0,0 +1,11 @@ +import androidx.compose.ui.window.ComposeUIViewController +import org.koin.compose.KoinApplication +import org.koin.core.KoinApplication + +fun controller() = ComposeUIViewController { + KoinApplication(application = { + modules(appModule) + }) { + AppContainer() + } +} \ No newline at end of file diff --git a/shared/src/iosMain/kotlin/Platform.ios.kt b/shared/src/iosMain/kotlin/Platform.ios.kt deleted file mode 100644 index 5cef987..0000000 --- a/shared/src/iosMain/kotlin/Platform.ios.kt +++ /dev/null @@ -1,7 +0,0 @@ -import platform.UIKit.UIDevice - -class IOSPlatform: Platform { - override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion -} - -actual fun getPlatform(): Platform = IOSPlatform() \ No newline at end of file diff --git a/shared/src/iosMain/kotlin/PlatformKoinModule.ios.kt b/shared/src/iosMain/kotlin/PlatformKoinModule.ios.kt new file mode 100644 index 0000000..478b578 --- /dev/null +++ b/shared/src/iosMain/kotlin/PlatformKoinModule.ios.kt @@ -0,0 +1,12 @@ +import org.koin.core.module.Module +import org.koin.dsl.module +import platform.UIKit.UIDevice + +class IosPlatform : Platform { + override val name: String = + UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion +} + +actual val platformModule: Module = module { + single { IosPlatform() } +} \ No newline at end of file diff --git a/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt b/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt new file mode 100644 index 0000000..b174615 --- /dev/null +++ b/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt @@ -0,0 +1,7 @@ +import io.architecture.core.di.coreKoinModules +import org.koin.core.module.Module +import org.koin.dsl.module + +actual val appModule: Module = module { + includes(coreKoinModules, platformModule) +} \ No newline at end of file diff --git a/shared/src/jvmMain/kotlin/Platform.jvm.kt b/shared/src/jvmMain/kotlin/Platform.jvm.kt deleted file mode 100644 index f5e7e49..0000000 --- a/shared/src/jvmMain/kotlin/Platform.jvm.kt +++ /dev/null @@ -1,5 +0,0 @@ -class JVMPlatform: Platform { - override val name: String = "Java ${System.getProperty("java.version")}" -} - -actual fun getPlatform(): Platform = JVMPlatform() \ No newline at end of file diff --git a/shared/src/jvmMain/kotlin/PlatformKoinModule.jvm.kt b/shared/src/jvmMain/kotlin/PlatformKoinModule.jvm.kt new file mode 100644 index 0000000..a2afebd --- /dev/null +++ b/shared/src/jvmMain/kotlin/PlatformKoinModule.jvm.kt @@ -0,0 +1,10 @@ +import org.koin.core.module.Module +import org.koin.dsl.module + +class JvmPlatform : Platform { + override val name: String = "Java ${System.getProperty("java.version")}" +} + +actual val platformModule: Module = module { + single { JvmPlatform() } +} \ No newline at end of file diff --git a/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt b/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt new file mode 100644 index 0000000..d02b445 --- /dev/null +++ b/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt @@ -0,0 +1,9 @@ +import org.koin.core.module.Module +import org.koin.dsl.module + +actual val appModule: Module = module { + includes( +// coreKoinModules, + platformModule, + ) +} \ No newline at end of file diff --git a/shared/src/wasmJsMain/kotlin/Platform.wasmJs.kt b/shared/src/wasmJsMain/kotlin/Platform.wasmJs.kt deleted file mode 100644 index 57b2e11..0000000 --- a/shared/src/wasmJsMain/kotlin/Platform.wasmJs.kt +++ /dev/null @@ -1,5 +0,0 @@ -class WasmPlatform: Platform { - override val name: String = "Web with Kotlin/Wasm" -} - -actual fun getPlatform(): Platform = WasmPlatform() \ No newline at end of file diff --git a/shared/src/wasmJsMain/kotlin/PlatformKoinModule.wasmJs.kt b/shared/src/wasmJsMain/kotlin/PlatformKoinModule.wasmJs.kt new file mode 100644 index 0000000..af71d12 --- /dev/null +++ b/shared/src/wasmJsMain/kotlin/PlatformKoinModule.wasmJs.kt @@ -0,0 +1,11 @@ + +import org.koin.core.module.Module +import org.koin.dsl.module + +class WasmPlatform : Platform { + override val name: String = "Web with Kotlin/Wasm" +} + +actual val platformModule: Module = module { + single { WasmPlatform() } +} \ No newline at end of file From 70c210ff97c75eb95a8ad220e7546480532c1c56 Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 25 Feb 2024 00:12:37 +0200 Subject: [PATCH 04/32] Configured :core:runtime:configuration module as multiplatform --- .../io/architecture/playground/MapActivity.kt | 4 +- .../playground/PlaygroundApplication.kt | 1 + compose-web-app/src/wasmJsMain/kotlin/main.kt | 4 +- .../io/architecture/core/di/CoreKoinModule.kt | 5 +- .../core/di/CoreKoinCheckModulesTest.kt | 4 +- core/runtime/configuration/build.gradle.kts | 62 ++++++++++++++++--- .../runtime/configuration/Platform.android.kt | 7 +++ .../core/runtime/configuration/Platform.kt | 7 +++ .../core/runtime/configuration/Runtime.kt | 7 +++ .../configuration/RuntimeKoinModule.kt | 14 +++++ .../configuration/WebsocketClientProvider.kt | 0 .../WebsocketRuntimeConfiguration.kt | 16 +++++ .../runtime/configuration/Platform.ios.kt | 8 +++ .../runtime/configuration/Platform.jvm.kt | 5 ++ .../RuntimeConfugurationModule.kt | 32 ---------- .../runtime/configuration/Platform.wasmJs.kt | 5 ++ shared/build.gradle.kts | 3 + .../kotlin/AppKoinModule.android.kt | 3 +- .../kotlin/PlatformKoinModule.android.kt | 11 ---- shared/src/commonMain/kotlin/App.kt | 10 ++- .../commonMain/kotlin/PlatformKoinModule.kt | 7 --- .../src/iosMain/kotlin/AppKoinModule.ios.kt | 3 +- .../iosMain/kotlin/PlatformKoinModule.ios.kt | 12 ---- .../src/jvmMain/kotlin/AppKoinModule.jvm.kt | 3 +- .../jvmMain/kotlin/PlatformKoinModule.jvm.kt | 10 --- .../wasmJsMain/kotlin/AppKoinModule.wasmJs.kt | 5 +- .../kotlin/PlatformKoinModule.wasmJs.kt | 11 ---- 27 files changed, 147 insertions(+), 112 deletions(-) create mode 100644 core/runtime/configuration/src/androidMain/kotlin/io/architecture/core/runtime/configuration/Platform.android.kt create mode 100644 core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/Platform.kt create mode 100644 core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/Runtime.kt create mode 100644 core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/RuntimeKoinModule.kt rename core/runtime/configuration/src/{main/java => commonMain/kotlin}/io/architecture/core/runtime/configuration/WebsocketClientProvider.kt (100%) create mode 100644 core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/WebsocketRuntimeConfiguration.kt create mode 100644 core/runtime/configuration/src/iosMain/kotlin/io/architecture/core/runtime/configuration/Platform.ios.kt create mode 100644 core/runtime/configuration/src/jvmMain/kotlin/io/architecture/core/runtime/configuration/Platform.jvm.kt delete mode 100644 core/runtime/configuration/src/main/java/io/architecture/core/runtime/configuration/RuntimeConfugurationModule.kt create mode 100644 core/runtime/configuration/src/wasmJsMain/kotlin/io/architecture/core/runtime/configuration/Platform.wasmJs.kt delete mode 100644 shared/src/androidMain/kotlin/PlatformKoinModule.android.kt delete mode 100644 shared/src/commonMain/kotlin/PlatformKoinModule.kt delete mode 100644 shared/src/iosMain/kotlin/PlatformKoinModule.ios.kt delete mode 100644 shared/src/jvmMain/kotlin/PlatformKoinModule.jvm.kt delete mode 100644 shared/src/wasmJsMain/kotlin/PlatformKoinModule.wasmJs.kt diff --git a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt index 395a5ca..9a1fb22 100644 --- a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt +++ b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt @@ -16,8 +16,8 @@ class MapActivity : ComponentActivity() { setContent { KoinContext { - MapScreen() -// AppWrapper() +// MapScreen() + AppWrapper() } } diff --git a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt index c613dc2..fa4d170 100644 --- a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt +++ b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/PlaygroundApplication.kt @@ -1,6 +1,7 @@ package io.architecture.playground import android.app.Application +import androidx.multidex.BuildConfig import appModule import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidLogger diff --git a/compose-web-app/src/wasmJsMain/kotlin/main.kt b/compose-web-app/src/wasmJsMain/kotlin/main.kt index 2ac15b4..994e804 100644 --- a/compose-web-app/src/wasmJsMain/kotlin/main.kt +++ b/compose-web-app/src/wasmJsMain/kotlin/main.kt @@ -5,8 +5,8 @@ import org.koin.compose.KoinApplication @OptIn(ExperimentalComposeUiApi::class) fun main() { CanvasBasedWindow(canvasElementId = "ComposeTarget") { - KoinApplication(application = { - modules(platformModule) + KoinApplication(application = {// TODO Move to shared for all targets + modules(appModule) }) { AppContainer() } diff --git a/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt b/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt index dad4685..efa169f 100644 --- a/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt +++ b/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt @@ -1,6 +1,6 @@ package io.architecture.core.di -import io.architecture.core.runtime.configuration.RuntimeConfigurationModule +import io.architecture.core.runtime.configuration.runtimeModule import io.architecture.data.repositoryModule import io.architecture.domain.di.useCaseModule import io.architecture.network.websocket.imp.ktor.di.ktorClientModule @@ -9,10 +9,11 @@ import io.architecture.network.websocket.imp.ktor.di.ktorServiceModule import org.koin.dsl.module import org.koin.ksp.generated.module +// umbrella module val coreKoinModules = module { includes( CoroutineKoinModule().module, - RuntimeConfigurationModule().module, + runtimeModule, repositoryModule, useCaseModule, ktorModule, diff --git a/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt b/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt index 43f984d..87fed57 100644 --- a/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt +++ b/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt @@ -1,6 +1,6 @@ package io.architecture.core.di -import io.architecture.core.runtime.configuration.RuntimeConfigurationModule +import io.architecture.core.runtime.configuration.runtimeModule import io.architecture.data.repositoryModule import io.architecture.datasource.api.LocalDataSource import io.architecture.datasource.api.NetworkDataSource @@ -19,7 +19,7 @@ class CoreKoinCheckModulesTest { private val coreModule = module { includes( CoroutineKoinModule().module, - RuntimeConfigurationModule().module, + runtimeModule, repositoryModule, useCaseModule, ktorModule, diff --git a/core/runtime/configuration/build.gradle.kts b/core/runtime/configuration/build.gradle.kts index 03dea96..0fcfe10 100644 --- a/core/runtime/configuration/build.gradle.kts +++ b/core/runtime/configuration/build.gradle.kts @@ -1,15 +1,57 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.ksp) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.androidLibrary) } -sourceSets.main { - java.srcDirs("build/generated/ksp/main/kotlin") +kotlin { + + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget { + compilations.all { + kotlinOptions { + jvmTarget = "17" + } + } + } + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() + + sourceSets { + val commonMain by getting { + dependencies { + implementation(libs.koin.core) + } + } + val wasmJsMain by getting + val iosX64Main by getting + val iosArm64Main by getting + val iosSimulatorArm64Main by getting + val iosMain by creating { + dependsOn(commonMain) + iosX64Main.dependsOn(this) + iosArm64Main.dependsOn(this) + iosSimulatorArm64Main.dependsOn(this) + } + } } -dependencies { - implementation(libs.koin.core) - implementation(libs.koin.annotations) - ksp(libs.koin.ksp.compiler) -} \ No newline at end of file +android { + namespace = "io.architecture.playground.runtime" + compileSdk = libs.versions.compileSdk.get().toInt() + + defaultConfig { + minSdk = libs.versions.minSdk.get().toInt() + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } +} diff --git a/core/runtime/configuration/src/androidMain/kotlin/io/architecture/core/runtime/configuration/Platform.android.kt b/core/runtime/configuration/src/androidMain/kotlin/io/architecture/core/runtime/configuration/Platform.android.kt new file mode 100644 index 0000000..cf53e78 --- /dev/null +++ b/core/runtime/configuration/src/androidMain/kotlin/io/architecture/core/runtime/configuration/Platform.android.kt @@ -0,0 +1,7 @@ +package io.architecture.core.runtime.configuration + +import android.os.Build + +actual val platform: IPlatform = object : IPlatform { + override val name: String = "Android ${Build.VERSION.SDK_INT}}" +} \ No newline at end of file diff --git a/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/Platform.kt b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/Platform.kt new file mode 100644 index 0000000..1a1a104 --- /dev/null +++ b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/Platform.kt @@ -0,0 +1,7 @@ +package io.architecture.core.runtime.configuration + +interface IPlatform { + val name: String +} + +expect val platform: IPlatform \ No newline at end of file diff --git a/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/Runtime.kt b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/Runtime.kt new file mode 100644 index 0000000..1c634a1 --- /dev/null +++ b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/Runtime.kt @@ -0,0 +1,7 @@ +package io.architecture.core.runtime.configuration + +data class Runtime( + val websocketConfiguration: WebsocketRuntimeConfiguration, + val platform: IPlatform, + val clientProvider: WebsocketClientProvider, +) \ No newline at end of file diff --git a/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/RuntimeKoinModule.kt b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/RuntimeKoinModule.kt new file mode 100644 index 0000000..f598611 --- /dev/null +++ b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/RuntimeKoinModule.kt @@ -0,0 +1,14 @@ +package io.architecture.core.runtime.configuration + +import org.koin.dsl.module + +val runtimeModule = module { + single { WebsocketRuntimeConfiguration() } + single { + Runtime( + get(), + platform, + WebsocketClientProvider.KTOR_PROTOBUF + ) + } +} \ No newline at end of file diff --git a/core/runtime/configuration/src/main/java/io/architecture/core/runtime/configuration/WebsocketClientProvider.kt b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/WebsocketClientProvider.kt similarity index 100% rename from core/runtime/configuration/src/main/java/io/architecture/core/runtime/configuration/WebsocketClientProvider.kt rename to core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/WebsocketClientProvider.kt diff --git a/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/WebsocketRuntimeConfiguration.kt b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/WebsocketRuntimeConfiguration.kt new file mode 100644 index 0000000..caf9386 --- /dev/null +++ b/core/runtime/configuration/src/commonMain/kotlin/io/architecture/core/runtime/configuration/WebsocketRuntimeConfiguration.kt @@ -0,0 +1,16 @@ +package io.architecture.core.runtime.configuration + +data class WebsocketRuntimeConfiguration( + val BASE_WS_HOST: String = "192.168.1.197", + val BASE_WS_PORT: Int = 8080, + val BASE_WS_URL: String = "ws://$BASE_WS_HOST}:$BASE_WS_PORT", + + // Scarlet uses: + val NODE_TRACES_WS_URL: String = "$BASE_WS_URL/nodes/traces", + val NODE_ROUTES_WS_URL: String = "$BASE_WS_URL/nodes/routes", + + // Ktor uses: + val NODE_TRACES_WS_PATH: String = "/nodes/traces", + val NODE_ROUTES_WS_PATH: String = "/nodes/routes", + val RTT_WS_PATH: String = "/rtt", +) diff --git a/core/runtime/configuration/src/iosMain/kotlin/io/architecture/core/runtime/configuration/Platform.ios.kt b/core/runtime/configuration/src/iosMain/kotlin/io/architecture/core/runtime/configuration/Platform.ios.kt new file mode 100644 index 0000000..958826d --- /dev/null +++ b/core/runtime/configuration/src/iosMain/kotlin/io/architecture/core/runtime/configuration/Platform.ios.kt @@ -0,0 +1,8 @@ +package io.architecture.core.runtime.configuration + +import platform.UIKit.UIDevice + +actual val platform: IPlatform = object : IPlatform { + override val name: String = + "Java ${UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion}" +} \ No newline at end of file diff --git a/core/runtime/configuration/src/jvmMain/kotlin/io/architecture/core/runtime/configuration/Platform.jvm.kt b/core/runtime/configuration/src/jvmMain/kotlin/io/architecture/core/runtime/configuration/Platform.jvm.kt new file mode 100644 index 0000000..f66690b --- /dev/null +++ b/core/runtime/configuration/src/jvmMain/kotlin/io/architecture/core/runtime/configuration/Platform.jvm.kt @@ -0,0 +1,5 @@ +package io.architecture.core.runtime.configuration + +actual val platform: IPlatform = object : IPlatform { + override val name: String = "Java ${System.getProperty("java.version")}" +} \ No newline at end of file diff --git a/core/runtime/configuration/src/main/java/io/architecture/core/runtime/configuration/RuntimeConfugurationModule.kt b/core/runtime/configuration/src/main/java/io/architecture/core/runtime/configuration/RuntimeConfugurationModule.kt deleted file mode 100644 index 2ab8593..0000000 --- a/core/runtime/configuration/src/main/java/io/architecture/core/runtime/configuration/RuntimeConfugurationModule.kt +++ /dev/null @@ -1,32 +0,0 @@ -package io.architecture.core.runtime.configuration - -import org.koin.core.annotation.ComponentScan -import org.koin.core.annotation.Module -import org.koin.core.annotation.Single - -class WebsocketRuntimeConfiguration { - val BASE_WS_HOST = "192.168.1.197" - val BASE_WS_PORT = 8080 - val BASE_WS_URL = "ws://$BASE_WS_HOST}:$BASE_WS_PORT" - - // Scarlet uses: - val NODE_TRACES_WS_URL = "$BASE_WS_URL/nodes/traces" - val NODE_ROUTES_WS_URL = "$BASE_WS_URL/nodes/routes" - - // Ktor uses: - val NODE_TRACES_WS_PATH = "/nodes/traces" - val NODE_ROUTES_WS_PATH = "/nodes/routes" - val RTT_WS_PATH = "/rtt" - - override fun toString(): String { - return BASE_WS_URL - } -} - -@Module -@ComponentScan("io.architecture.network.websocket.api") -class RuntimeConfigurationModule { - - @Single - fun websocketRuntimeConfiguration() = WebsocketRuntimeConfiguration() -} \ No newline at end of file diff --git a/core/runtime/configuration/src/wasmJsMain/kotlin/io/architecture/core/runtime/configuration/Platform.wasmJs.kt b/core/runtime/configuration/src/wasmJsMain/kotlin/io/architecture/core/runtime/configuration/Platform.wasmJs.kt new file mode 100644 index 0000000..b7d8c7c --- /dev/null +++ b/core/runtime/configuration/src/wasmJsMain/kotlin/io/architecture/core/runtime/configuration/Platform.wasmJs.kt @@ -0,0 +1,5 @@ +package io.architecture.core.runtime.configuration + +actual val platform: IPlatform = object : IPlatform { + override val name: String = "Wasm" +} \ No newline at end of file diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 9b30a7a..1294490 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -55,6 +55,8 @@ kotlin { implementation(compose.ui) @OptIn(ExperimentalComposeLibrary::class) implementation(compose.components.resources) + + implementation(projects.core.runtime.configuration) } } val iosX64Main by getting @@ -77,6 +79,7 @@ kotlin { } val wasmJsMain by getting { dependencies { + } } } diff --git a/shared/src/androidMain/kotlin/AppKoinModule.android.kt b/shared/src/androidMain/kotlin/AppKoinModule.android.kt index 773a733..6fe6aa5 100644 --- a/shared/src/androidMain/kotlin/AppKoinModule.android.kt +++ b/shared/src/androidMain/kotlin/AppKoinModule.android.kt @@ -1,4 +1,5 @@ import io.architecture.core.di.coreKoinModules +import io.architecture.core.runtime.configuration.runtimeModule import io.architecture.database.imp.room.di.roomDaoModule import io.architecture.database.imp.room.di.roomDatabaseModule import io.architecture.map.featureMapModule @@ -7,7 +8,7 @@ import org.koin.dsl.module actual val appModule = module { includes( coreKoinModules, - platformModule, + runtimeModule, roomDaoModule, roomDatabaseModule, featureMapModule diff --git a/shared/src/androidMain/kotlin/PlatformKoinModule.android.kt b/shared/src/androidMain/kotlin/PlatformKoinModule.android.kt deleted file mode 100644 index 5e0fc4c..0000000 --- a/shared/src/androidMain/kotlin/PlatformKoinModule.android.kt +++ /dev/null @@ -1,11 +0,0 @@ -import android.os.Build -import org.koin.core.module.Module -import org.koin.dsl.module - -class AndroidPlatform : Platform { - override val name: String = "Android ${Build.VERSION.SDK_INT}" -} - -actual val platformModule: Module = module { - single { AndroidPlatform() } -} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/App.kt b/shared/src/commonMain/kotlin/App.kt index d9423ab..da2768d 100644 --- a/shared/src/commonMain/kotlin/App.kt +++ b/shared/src/commonMain/kotlin/App.kt @@ -1,5 +1,4 @@ import androidx.compose.animation.AnimatedVisibility -import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material.Button @@ -12,9 +11,8 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import org.jetbrains.compose.resources.DrawableResource +import io.architecture.core.runtime.configuration.Runtime import org.jetbrains.compose.resources.ExperimentalResourceApi -import org.jetbrains.compose.resources.painterResource import org.koin.compose.koinInject @OptIn(ExperimentalResourceApi::class) @@ -22,7 +20,7 @@ import org.koin.compose.koinInject fun AppContainer() { MaterialTheme { var showContent by remember { mutableStateOf(false) } - val platform = koinInject() + val runtime = koinInject() Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { Button(onClick = { showContent = !showContent }) { Text("Click me!") @@ -33,8 +31,8 @@ fun AppContainer() { horizontalAlignment = Alignment.CenterHorizontally ) { // Web app stuck on it - Image(painterResource(DrawableResource("compose-multiplatform.xml")), null) - Text("Compose: ${platform.name}") +// Image(painterResource(DrawableResource("compose-multiplatform.xml")), null) + Text("Compose: ${runtime.platform.name},\nRuntime configuration: ${runtime.websocketConfiguration}") } } } diff --git a/shared/src/commonMain/kotlin/PlatformKoinModule.kt b/shared/src/commonMain/kotlin/PlatformKoinModule.kt deleted file mode 100644 index a2cafe5..0000000 --- a/shared/src/commonMain/kotlin/PlatformKoinModule.kt +++ /dev/null @@ -1,7 +0,0 @@ -import org.koin.core.module.Module - -interface Platform { - val name: String -} - -expect val platformModule: Module \ No newline at end of file diff --git a/shared/src/iosMain/kotlin/AppKoinModule.ios.kt b/shared/src/iosMain/kotlin/AppKoinModule.ios.kt index ee8f13a..1914d29 100644 --- a/shared/src/iosMain/kotlin/AppKoinModule.ios.kt +++ b/shared/src/iosMain/kotlin/AppKoinModule.ios.kt @@ -1,6 +1,7 @@ +import io.architecture.core.runtime.configuration.runtimeModule import org.koin.core.module.Module import org.koin.dsl.module actual val appModule: Module = module { - includes(platformModule) + includes(runtimeModule) } \ No newline at end of file diff --git a/shared/src/iosMain/kotlin/PlatformKoinModule.ios.kt b/shared/src/iosMain/kotlin/PlatformKoinModule.ios.kt deleted file mode 100644 index 478b578..0000000 --- a/shared/src/iosMain/kotlin/PlatformKoinModule.ios.kt +++ /dev/null @@ -1,12 +0,0 @@ -import org.koin.core.module.Module -import org.koin.dsl.module -import platform.UIKit.UIDevice - -class IosPlatform : Platform { - override val name: String = - UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion -} - -actual val platformModule: Module = module { - single { IosPlatform() } -} \ No newline at end of file diff --git a/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt b/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt index b174615..0b51dc3 100644 --- a/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt +++ b/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt @@ -1,7 +1,8 @@ import io.architecture.core.di.coreKoinModules +import io.architecture.core.runtime.configuration.runtimeModule import org.koin.core.module.Module import org.koin.dsl.module actual val appModule: Module = module { - includes(coreKoinModules, platformModule) + includes(coreKoinModules, runtimeModule) } \ No newline at end of file diff --git a/shared/src/jvmMain/kotlin/PlatformKoinModule.jvm.kt b/shared/src/jvmMain/kotlin/PlatformKoinModule.jvm.kt deleted file mode 100644 index a2afebd..0000000 --- a/shared/src/jvmMain/kotlin/PlatformKoinModule.jvm.kt +++ /dev/null @@ -1,10 +0,0 @@ -import org.koin.core.module.Module -import org.koin.dsl.module - -class JvmPlatform : Platform { - override val name: String = "Java ${System.getProperty("java.version")}" -} - -actual val platformModule: Module = module { - single { JvmPlatform() } -} \ No newline at end of file diff --git a/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt b/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt index d02b445..61b0ec8 100644 --- a/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt +++ b/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt @@ -1,9 +1,10 @@ +import io.architecture.core.runtime.configuration.runtimeModule import org.koin.core.module.Module import org.koin.dsl.module actual val appModule: Module = module { includes( -// coreKoinModules, - platformModule, +// coreKoinModules, will be soon here + runtimeModule, ) } \ No newline at end of file diff --git a/shared/src/wasmJsMain/kotlin/PlatformKoinModule.wasmJs.kt b/shared/src/wasmJsMain/kotlin/PlatformKoinModule.wasmJs.kt deleted file mode 100644 index af71d12..0000000 --- a/shared/src/wasmJsMain/kotlin/PlatformKoinModule.wasmJs.kt +++ /dev/null @@ -1,11 +0,0 @@ - -import org.koin.core.module.Module -import org.koin.dsl.module - -class WasmPlatform : Platform { - override val name: String = "Web with Kotlin/Wasm" -} - -actual val platformModule: Module = module { - single { WasmPlatform() } -} \ No newline at end of file From 8a9bd312915ea86efc9278246359bd559210fc06 Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 25 Feb 2024 00:21:16 +0200 Subject: [PATCH 05/32] Removed unused .gitignore --- core/common/.gitignore | 1 - core/data/.gitignore | 1 - core/database/api/.gitignore | 1 - core/database/imp/room/.gitignore | 1 - core/datasource/api/.gitignore | 1 - core/designsystem/.gitignore | 1 - core/di/.gitignore | 1 - core/domain/.gitignore | 1 - core/model/.gitignore | 1 - core/network/websocket/api/.gitignore | 1 - core/network/websocket/imp/ktor/.gitignore | 1 - core/network/websocket/imp/scarlet/.gitignore | 1 - core/pool/.gitignore | 1 - core/runtime/configuration/.gitignore | 1 - core/runtime/logging/.gitignore | 1 - core/runtime/metrics/.gitignore | 1 - core/ui/.gitignore | 1 - feature/map/.gitignore | 1 - microbenchmark/.gitignore | 1 - 19 files changed, 19 deletions(-) delete mode 100644 core/common/.gitignore delete mode 100644 core/data/.gitignore delete mode 100644 core/database/api/.gitignore delete mode 100644 core/database/imp/room/.gitignore delete mode 100644 core/datasource/api/.gitignore delete mode 100644 core/designsystem/.gitignore delete mode 100644 core/di/.gitignore delete mode 100644 core/domain/.gitignore delete mode 100644 core/model/.gitignore delete mode 100644 core/network/websocket/api/.gitignore delete mode 100644 core/network/websocket/imp/ktor/.gitignore delete mode 100644 core/network/websocket/imp/scarlet/.gitignore delete mode 100644 core/pool/.gitignore delete mode 100644 core/runtime/configuration/.gitignore delete mode 100644 core/runtime/logging/.gitignore delete mode 100644 core/runtime/metrics/.gitignore delete mode 100644 core/ui/.gitignore delete mode 100644 feature/map/.gitignore delete mode 100644 microbenchmark/.gitignore diff --git a/core/common/.gitignore b/core/common/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/data/.gitignore b/core/data/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/data/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/database/api/.gitignore b/core/database/api/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/database/api/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/database/imp/room/.gitignore b/core/database/imp/room/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/database/imp/room/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/datasource/api/.gitignore b/core/datasource/api/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/datasource/api/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/designsystem/.gitignore b/core/designsystem/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/designsystem/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/di/.gitignore b/core/di/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/di/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/domain/.gitignore b/core/domain/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/domain/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/model/.gitignore b/core/model/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/model/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/network/websocket/api/.gitignore b/core/network/websocket/api/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/network/websocket/api/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/network/websocket/imp/ktor/.gitignore b/core/network/websocket/imp/ktor/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/network/websocket/imp/ktor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/network/websocket/imp/scarlet/.gitignore b/core/network/websocket/imp/scarlet/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/network/websocket/imp/scarlet/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/pool/.gitignore b/core/pool/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/pool/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/runtime/configuration/.gitignore b/core/runtime/configuration/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/runtime/configuration/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/runtime/logging/.gitignore b/core/runtime/logging/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/runtime/logging/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/runtime/metrics/.gitignore b/core/runtime/metrics/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/runtime/metrics/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/ui/.gitignore b/core/ui/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/core/ui/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/feature/map/.gitignore b/feature/map/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/feature/map/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/microbenchmark/.gitignore b/microbenchmark/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/microbenchmark/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file From 0f5b7e7ef4d0dc4cf08d8940ca1394c6b811d6ca Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 25 Feb 2024 14:31:03 +0200 Subject: [PATCH 06/32] Declared AndroidLibraryConventionPlugin to remove android {} duplications and have consistency --- build-logic/convention/build.gradle.kts | 40 +++++++++++++++++++ .../kotlin/AndroidLibraryConventionPlugin.kt | 35 ++++++++++++++++ build-logic/settings.gradle.kts | 14 +++++++ core/runtime/configuration/build.gradle.kts | 16 +------- gradle/libs.versions.toml | 11 +++++ settings.gradle.kts | 4 +- 6 files changed, 103 insertions(+), 17 deletions(-) create mode 100644 build-logic/convention/build.gradle.kts create mode 100644 build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt create mode 100644 build-logic/settings.gradle.kts diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts new file mode 100644 index 0000000..0623bf3 --- /dev/null +++ b/build-logic/convention/build.gradle.kts @@ -0,0 +1,40 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + `kotlin-dsl` +} + +group = "io.architecture.plugin.convention" + +// Configure the build-logic plugins to target JDK 17 +// This matches the JDK used to build the project, and is not related to what is running on device. +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} +tasks.withType().configureEach { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } +} + +dependencies { + compileOnly(libs.android.gradlePlugin) + compileOnly(libs.android.tools.common) +} + +tasks { + validatePlugins { + enableStricterValidation = true + failOnWarning = true + } +} + +gradlePlugin { + plugins { + register("androidLibrary") { + id = "io.architecture.android.library" + implementationClass = "AndroidLibraryConventionPlugin" + } + } +} \ No newline at end of file diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt new file mode 100644 index 0000000..1f628f0 --- /dev/null +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -0,0 +1,35 @@ +import com.android.build.api.variant.LibraryAndroidComponentsExtension +import com.android.build.gradle.LibraryExtension +import io.architecture.build.logic.libs +import org.gradle.api.JavaVersion +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.kotlin.dsl.configure +import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.kotlin + +class AndroidLibraryConventionPlugin : Plugin { + override fun apply(target: Project) { + with(target) { + with(pluginManager) { + apply("com.android.library") + } + extensions.configure { + namespace = "io.architecture.playground" + path.replace(":", ".") + + compileSdk = libs.findVersion("compileSdk").get().requiredVersion.toInt() + defaultConfig.targetSdk = + libs.findVersion("tragetSdk").get().requiredVersion.toInt() + + compileOptions.sourceCompatibility = JavaVersion.VERSION_17 + compileOptions.targetCompatibility = JavaVersion.VERSION_17 + } + extensions.configure { + + } + dependencies { + add("testImplementation", kotlin("test")) + } + } + } +} diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts new file mode 100644 index 0000000..6225785 --- /dev/null +++ b/build-logic/settings.gradle.kts @@ -0,0 +1,14 @@ +dependencyResolutionManagement { + repositories { + google() + mavenCentral() + } + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} + +rootProject.name = "build-logic" +include(":convention") \ No newline at end of file diff --git a/core/runtime/configuration/build.gradle.kts b/core/runtime/configuration/build.gradle.kts index 0fcfe10..2a97a5a 100644 --- a/core/runtime/configuration/build.gradle.kts +++ b/core/runtime/configuration/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl plugins { alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.androidLibrary) + alias(libs.plugins.convention.android.library) } kotlin { @@ -41,17 +41,3 @@ kotlin { } } } - -android { - namespace = "io.architecture.playground.runtime" - compileSdk = libs.versions.compileSdk.get().toInt() - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6fe6946..afd092a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,6 +9,7 @@ jvmTarget = "1.8" # Plugins composePlugin = "1.6.0-beta02" +androidTools = "31.2.0" geojsonVersion = "0.2.1" kotlinxSerializationJsonVersion = "1.6.3" kotlinxSerializationProtobufVersion = "1.6.3" @@ -158,6 +159,13 @@ ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "kto ktor-server-netty = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktor" } ktor-server-tests = { module = "io.ktor:ktor-server-tests-jvm", version.ref = "ktor" } +# Dependencies of the included build-logic +android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" } +android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" } +kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } +ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" } +room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "roomKtxVersion" } + [bundles] [plugins] @@ -171,6 +179,9 @@ modulegraph = { id = "dev.iurysouza.modulegraph", version.ref = "modulegraphMerm ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" } +# Plugins of build-logic +convention-android-library = { id = "io.architecture.android.library", version = "unspecified" } + # Common kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } # Ktor server diff --git a/settings.gradle.kts b/settings.gradle.kts index 7d0649f..e3be2d5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,7 @@ rootProject.name = "node_traces_streaming" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { + includeBuild("build-logic") repositories { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") google() @@ -53,5 +54,4 @@ include(":core:runtime:logging") include(":core:runtime:metrics") include(":core:ui") -include(":feature:map") - +include(":feature:map") \ No newline at end of file From b92e15a99a0d5ea4aee1031763390fe340acbd0b Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 25 Feb 2024 15:14:48 +0200 Subject: [PATCH 07/32] Configure compileOptions in modules. Was mismatch --- build-logic/convention/build.gradle.kts | 1 + .../kotlin/AndroidLibraryConventionPlugin.kt | 13 ++--------- compose-common/build.gradle.kts | 8 +------ core/database/imp/room/build.gradle.kts | 10 +++------ core/designsystem/build.gradle.kts | 10 +++------ .../websocket/imp/scarlet/build.gradle.kts | 9 ++------ core/pool/build.gradle.kts | 4 ++-- core/runtime/configuration/build.gradle.kts | 8 +------ core/ui/build.gradle.kts | 10 +++------ feature/map/build.gradle.kts | 10 +++------ gradle/libs.versions.toml | 2 +- microbenchmark/build.gradle.kts | 4 ++-- shared/build.gradle.kts | 22 ++----------------- 13 files changed, 26 insertions(+), 85 deletions(-) diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 0623bf3..f0f9803 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -21,6 +21,7 @@ tasks.withType().configureEach { dependencies { compileOnly(libs.android.gradlePlugin) compileOnly(libs.android.tools.common) + compileOnly(libs.kotlin.gradlePlugin) } tasks { diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index 1f628f0..9f624e3 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -1,7 +1,6 @@ import com.android.build.api.variant.LibraryAndroidComponentsExtension import com.android.build.gradle.LibraryExtension -import io.architecture.build.logic.libs -import org.gradle.api.JavaVersion +import io.architecture.build.logic.configureKotlinAndroid import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure @@ -15,17 +14,9 @@ class AndroidLibraryConventionPlugin : Plugin { apply("com.android.library") } extensions.configure { - namespace = "io.architecture.playground" + path.replace(":", ".") - - compileSdk = libs.findVersion("compileSdk").get().requiredVersion.toInt() - defaultConfig.targetSdk = - libs.findVersion("tragetSdk").get().requiredVersion.toInt() - - compileOptions.sourceCompatibility = JavaVersion.VERSION_17 - compileOptions.targetCompatibility = JavaVersion.VERSION_17 + configureKotlinAndroid(this) } extensions.configure { - } dependencies { add("testImplementation", kotlin("test")) diff --git a/compose-common/build.gradle.kts b/compose-common/build.gradle.kts index b475e8c..9b32df7 100644 --- a/compose-common/build.gradle.kts +++ b/compose-common/build.gradle.kts @@ -14,13 +14,7 @@ kotlin { browser() } - androidTarget { - compilations.all { - kotlinOptions { - jvmTarget = "17" - } - } - } + androidTarget() listOf( iosX64(), diff --git a/core/database/imp/room/build.gradle.kts b/core/database/imp/room/build.gradle.kts index 970d10d..a1dbe86 100644 --- a/core/database/imp/room/build.gradle.kts +++ b/core/database/imp/room/build.gradle.kts @@ -10,11 +10,7 @@ android { namespace = "io.architecture.database.imp.room" compileSdk = libs.versions.compileSdk.get().toInt() - buildTypes { - release { - isMinifyEnabled = false - } - } + libraryVariants.all { val variantName = name sourceSets { @@ -24,8 +20,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = libs.versions.jvmTarget.get() diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index c5df4ea..c565a82 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -8,14 +8,10 @@ android { namespace = "io.architecture.core.design.system" compileSdk = libs.versions.compileSdk.get().toInt() - buildTypes { - release { - isMinifyEnabled = false - } - } + compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = libs.versions.jvmTarget.get() diff --git a/core/network/websocket/imp/scarlet/build.gradle.kts b/core/network/websocket/imp/scarlet/build.gradle.kts index 90f43d5..7d436f6 100644 --- a/core/network/websocket/imp/scarlet/build.gradle.kts +++ b/core/network/websocket/imp/scarlet/build.gradle.kts @@ -10,11 +10,6 @@ android { namespace = "io.architecture.scarlet" compileSdk = libs.versions.compileSdk.get().toInt() - buildTypes { - release { - isMinifyEnabled = false - } - } libraryVariants.all { val variantName = name sourceSets { @@ -24,8 +19,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = libs.versions.jvmTarget.get() diff --git a/core/pool/build.gradle.kts b/core/pool/build.gradle.kts index e78dcb2..e71ba7f 100644 --- a/core/pool/build.gradle.kts +++ b/core/pool/build.gradle.kts @@ -15,8 +15,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = libs.versions.jvmTarget.get() diff --git a/core/runtime/configuration/build.gradle.kts b/core/runtime/configuration/build.gradle.kts index 2a97a5a..8df61ed 100644 --- a/core/runtime/configuration/build.gradle.kts +++ b/core/runtime/configuration/build.gradle.kts @@ -11,13 +11,7 @@ kotlin { wasmJs { browser() } - androidTarget { - compilations.all { - kotlinOptions { - jvmTarget = "17" - } - } - } + androidTarget() iosX64() iosArm64() iosSimulatorArm64() diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index f26286c..381db2b 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -8,14 +8,10 @@ android { namespace = "io.architecture.ui" compileSdk = libs.versions.compileSdk.get().toInt() - buildTypes { - release { - isMinifyEnabled = false - } - } + compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = libs.versions.jvmTarget.get() diff --git a/feature/map/build.gradle.kts b/feature/map/build.gradle.kts index dddc20b..9d7a975 100644 --- a/feature/map/build.gradle.kts +++ b/feature/map/build.gradle.kts @@ -21,14 +21,10 @@ android { } } } - buildTypes { - release { - isMinifyEnabled = false - } - } + compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = libs.versions.jvmTarget.get() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index afd092a..7a6f388 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ tragetSdk = "34" compileSdk = "34" kotlinCompilerExtensionVersion = "1.5.7" -jvmTarget = "1.8" +jvmTarget = "17" # Plugins composePlugin = "1.6.0-beta02" diff --git a/microbenchmark/build.gradle.kts b/microbenchmark/build.gradle.kts index 4df26d9..0d08e87 100644 --- a/microbenchmark/build.gradle.kts +++ b/microbenchmark/build.gradle.kts @@ -10,8 +10,8 @@ android { compileSdk = libs.versions.compileSdk.get().toInt() compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 1294490..bbcd8a2 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl plugins { alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.androidLibrary) + alias(libs.plugins.convention.android.library) alias(libs.plugins.jetbrainsCompose) } @@ -13,13 +13,7 @@ kotlin { browser() } - androidTarget { - compilations.all { - kotlinOptions { - jvmTarget = "17" - } - } - } + androidTarget() listOf( iosX64(), @@ -84,15 +78,3 @@ kotlin { } } } - -android { - namespace = "io.architecture.playground.shared" - compileSdk = libs.versions.compileSdk.get().toInt() - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } -} From 0ca5db3e2e937b801b4bebcdc89802c3594eb624 Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 25 Feb 2024 15:32:07 +0200 Subject: [PATCH 08/32] Apply default hierarchy template for hierarchical nultiplatform project structure --- compose-common/build.gradle.kts | 28 +++------------------ core/runtime/configuration/build.gradle.kts | 13 ++-------- core/runtime/metrics/build.gradle.kts | 27 +++++++++++++++++--- shared/build.gradle.kts | 12 +++------ 4 files changed, 32 insertions(+), 48 deletions(-) diff --git a/compose-common/build.gradle.kts b/compose-common/build.gradle.kts index 9b32df7..9a1145e 100644 --- a/compose-common/build.gradle.kts +++ b/compose-common/build.gradle.kts @@ -3,12 +3,13 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl plugins { alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.androidLibrary) + alias(libs.plugins.convention.android.library) alias(libs.plugins.jetbrainsCompose) } kotlin { - + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() @OptIn(ExperimentalWasmDsl::class) wasmJs { browser() @@ -43,28 +44,5 @@ kotlin { implementation(compose.components.resources) } } - val iosX64Main by getting - val iosArm64Main by getting - val iosSimulatorArm64Main by getting - val iosMain by creating { - dependsOn(commonMain) - iosX64Main.dependsOn(this) - iosArm64Main.dependsOn(this) - iosSimulatorArm64Main.dependsOn(this) - } - } -} - -android { - namespace = "io.architecture.playground.compose.common" - compileSdk = libs.versions.compileSdk.get().toInt() - - defaultConfig { - minSdk = libs.versions.minSdk.get().toInt() - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 } } diff --git a/core/runtime/configuration/build.gradle.kts b/core/runtime/configuration/build.gradle.kts index 8df61ed..67f5d2d 100644 --- a/core/runtime/configuration/build.gradle.kts +++ b/core/runtime/configuration/build.gradle.kts @@ -6,7 +6,8 @@ plugins { } kotlin { - + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() @OptIn(ExperimentalWasmDsl::class) wasmJs { browser() @@ -23,15 +24,5 @@ kotlin { implementation(libs.koin.core) } } - val wasmJsMain by getting - val iosX64Main by getting - val iosArm64Main by getting - val iosSimulatorArm64Main by getting - val iosMain by creating { - dependsOn(commonMain) - iosX64Main.dependsOn(this) - iosArm64Main.dependsOn(this) - iosSimulatorArm64Main.dependsOn(this) - } } } diff --git a/core/runtime/metrics/build.gradle.kts b/core/runtime/metrics/build.gradle.kts index 88da1d4..294511c 100644 --- a/core/runtime/metrics/build.gradle.kts +++ b/core/runtime/metrics/build.gradle.kts @@ -1,7 +1,28 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -dependencies { +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() + + sourceSets { + val commonMain by getting { + dependencies { + implementation(libs.koin.core) + } + } + } } \ No newline at end of file diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index bbcd8a2..a9179fd 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -8,6 +8,8 @@ plugins { } kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() @OptIn(ExperimentalWasmDsl::class) wasmJs { browser() @@ -53,15 +55,7 @@ kotlin { implementation(projects.core.runtime.configuration) } } - val iosX64Main by getting - val iosArm64Main by getting - val iosSimulatorArm64Main by getting - val iosMain by creating { - dependsOn(commonMain) - iosX64Main.dependsOn(this) - iosArm64Main.dependsOn(this) - iosSimulatorArm64Main.dependsOn(this) - + val iosMain by getting { dependencies { implementation(libs.koin.mp.compose) } From ea4c1090fa2d137cdeb9040f4c926df7ccb571bc Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 25 Feb 2024 16:17:32 +0200 Subject: [PATCH 09/32] Migrated jvm-targeted :core:common, :core:model and :core:runtime:logging to multiplatform modules --- core/common/build.gradle.kts | 33 +++++++++++++++---- .../kotlin/io/architecture/common/Logger.kt | 8 +++++ .../kotlin}/io/architecture/common/Result.kt | 0 .../architecture/common/ext/FlowChunkedExt.kt | 0 .../java/io/architecture/common/Logger.kt | 7 ---- core/model/build.gradle.kts | 25 ++++++++++++-- .../architecture/model/CompositeNodeTrace.kt | 1 - .../io/architecture/model/Connection.kt | 0 .../io/architecture/model/Coordinate.kt | 0 .../kotlin}/io/architecture/model/Node.kt | 0 .../kotlin}/io/architecture/model/Route.kt | 0 .../model/SocketConnectionEvent.kt | 0 .../kotlin}/io/architecture/model/Trace.kt | 6 ++-- .../io/architecture/model/UpstreamRtt.kt | 2 ++ core/runtime/logging/build.gradle.kts | 19 +++++++++-- .../io/architecture/runtime/logging/Logger.kt | 0 gradle/libs.versions.toml | 2 ++ kotlin-js-store/yarn.lock | 5 +++ 18 files changed, 85 insertions(+), 23 deletions(-) create mode 100644 core/common/src/commonMain/kotlin/io/architecture/common/Logger.kt rename core/common/src/{main/java => commonMain/kotlin}/io/architecture/common/Result.kt (100%) rename core/common/src/{main/java => commonMain/kotlin}/io/architecture/common/ext/FlowChunkedExt.kt (100%) delete mode 100644 core/common/src/main/java/io/architecture/common/Logger.kt rename core/model/src/{main/java => commonMain/kotlin}/io/architecture/model/CompositeNodeTrace.kt (89%) rename core/model/src/{main/java => commonMain/kotlin}/io/architecture/model/Connection.kt (100%) rename core/model/src/{main/java => commonMain/kotlin}/io/architecture/model/Coordinate.kt (100%) rename core/model/src/{main/java => commonMain/kotlin}/io/architecture/model/Node.kt (100%) rename core/model/src/{main/java => commonMain/kotlin}/io/architecture/model/Route.kt (100%) rename core/model/src/{main/java => commonMain/kotlin}/io/architecture/model/SocketConnectionEvent.kt (100%) rename core/model/src/{main/java => commonMain/kotlin}/io/architecture/model/Trace.kt (71%) rename core/model/src/{main/java => commonMain/kotlin}/io/architecture/model/UpstreamRtt.kt (74%) rename core/runtime/logging/src/{main/java => commonMain/kotlin}/io/architecture/runtime/logging/Logger.kt (100%) diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 608637c..b7b42a1 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -1,11 +1,32 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -dependencies { - implementation(projects.core.runtime.logging) +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() - implementation(libs.kotlinx.coroutine.android) - testImplementation(libs.junit.junit) + sourceSets { + commonMain.dependencies { + implementation(libs.koin.core) + implementation(libs.kotlinx.coroutine.core) + implementation(projects.core.runtime.logging) + } + androidMain.dependencies { + // https://github.com/Kotlin/kotlinx.coroutines?tab=readme-ov-file#multiplatform + implementation(libs.kotlinx.coroutine.android) + } + } } \ No newline at end of file diff --git a/core/common/src/commonMain/kotlin/io/architecture/common/Logger.kt b/core/common/src/commonMain/kotlin/io/architecture/common/Logger.kt new file mode 100644 index 0000000..da248e2 --- /dev/null +++ b/core/common/src/commonMain/kotlin/io/architecture/common/Logger.kt @@ -0,0 +1,8 @@ +package io.architecture.common + +import io.architecture.runtime.logging.Logger + + +// todo +// internal fun logCoroutineInfo(tag: String, msg: String) = +// Logger.debug(tag, "Running on: [${Thread.currentThread().name}] | $msg") diff --git a/core/common/src/main/java/io/architecture/common/Result.kt b/core/common/src/commonMain/kotlin/io/architecture/common/Result.kt similarity index 100% rename from core/common/src/main/java/io/architecture/common/Result.kt rename to core/common/src/commonMain/kotlin/io/architecture/common/Result.kt diff --git a/core/common/src/main/java/io/architecture/common/ext/FlowChunkedExt.kt b/core/common/src/commonMain/kotlin/io/architecture/common/ext/FlowChunkedExt.kt similarity index 100% rename from core/common/src/main/java/io/architecture/common/ext/FlowChunkedExt.kt rename to core/common/src/commonMain/kotlin/io/architecture/common/ext/FlowChunkedExt.kt diff --git a/core/common/src/main/java/io/architecture/common/Logger.kt b/core/common/src/main/java/io/architecture/common/Logger.kt deleted file mode 100644 index 883f356..0000000 --- a/core/common/src/main/java/io/architecture/common/Logger.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.architecture.common - -import io.architecture.runtime.logging.Logger - - -internal fun logCoroutineInfo(tag: String, msg: String) = - Logger.debug(tag, "Running on: [${Thread.currentThread().name}] | $msg") diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index 88da1d4..1287302 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -1,7 +1,26 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -dependencies { +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() + + sourceSets { + commonMain.dependencies { + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0") + } + } } \ No newline at end of file diff --git a/core/model/src/main/java/io/architecture/model/CompositeNodeTrace.kt b/core/model/src/commonMain/kotlin/io/architecture/model/CompositeNodeTrace.kt similarity index 89% rename from core/model/src/main/java/io/architecture/model/CompositeNodeTrace.kt rename to core/model/src/commonMain/kotlin/io/architecture/model/CompositeNodeTrace.kt index 2f2c178..6ec2531 100644 --- a/core/model/src/main/java/io/architecture/model/CompositeNodeTrace.kt +++ b/core/model/src/commonMain/kotlin/io/architecture/model/CompositeNodeTrace.kt @@ -6,7 +6,6 @@ data class CompositeNodeTrace( ) { override fun equals(other: Any?): Boolean { if (this === other) return true - if (javaClass != other?.javaClass) return false other as CompositeNodeTrace diff --git a/core/model/src/main/java/io/architecture/model/Connection.kt b/core/model/src/commonMain/kotlin/io/architecture/model/Connection.kt similarity index 100% rename from core/model/src/main/java/io/architecture/model/Connection.kt rename to core/model/src/commonMain/kotlin/io/architecture/model/Connection.kt diff --git a/core/model/src/main/java/io/architecture/model/Coordinate.kt b/core/model/src/commonMain/kotlin/io/architecture/model/Coordinate.kt similarity index 100% rename from core/model/src/main/java/io/architecture/model/Coordinate.kt rename to core/model/src/commonMain/kotlin/io/architecture/model/Coordinate.kt diff --git a/core/model/src/main/java/io/architecture/model/Node.kt b/core/model/src/commonMain/kotlin/io/architecture/model/Node.kt similarity index 100% rename from core/model/src/main/java/io/architecture/model/Node.kt rename to core/model/src/commonMain/kotlin/io/architecture/model/Node.kt diff --git a/core/model/src/main/java/io/architecture/model/Route.kt b/core/model/src/commonMain/kotlin/io/architecture/model/Route.kt similarity index 100% rename from core/model/src/main/java/io/architecture/model/Route.kt rename to core/model/src/commonMain/kotlin/io/architecture/model/Route.kt diff --git a/core/model/src/main/java/io/architecture/model/SocketConnectionEvent.kt b/core/model/src/commonMain/kotlin/io/architecture/model/SocketConnectionEvent.kt similarity index 100% rename from core/model/src/main/java/io/architecture/model/SocketConnectionEvent.kt rename to core/model/src/commonMain/kotlin/io/architecture/model/SocketConnectionEvent.kt diff --git a/core/model/src/main/java/io/architecture/model/Trace.kt b/core/model/src/commonMain/kotlin/io/architecture/model/Trace.kt similarity index 71% rename from core/model/src/main/java/io/architecture/model/Trace.kt rename to core/model/src/commonMain/kotlin/io/architecture/model/Trace.kt index 5689b23..9c8fd93 100644 --- a/core/model/src/main/java/io/architecture/model/Trace.kt +++ b/core/model/src/commonMain/kotlin/io/architecture/model/Trace.kt @@ -1,6 +1,6 @@ package io.architecture.model -import java.util.Date +import kotlinx.datetime.LocalDateTime data class Trace( var nodeId: String = "", @@ -9,9 +9,9 @@ data class Trace( var speed: Int = 0, var azimuth: Double = 0.0, var alt: Double = 0.0, - var sentAtTime: Date, + var sentAtTime: LocalDateTime, var formattedDatetime: String? = "", - var direction: String? = "" + var direction: String? = "", ) diff --git a/core/model/src/main/java/io/architecture/model/UpstreamRtt.kt b/core/model/src/commonMain/kotlin/io/architecture/model/UpstreamRtt.kt similarity index 74% rename from core/model/src/main/java/io/architecture/model/UpstreamRtt.kt rename to core/model/src/commonMain/kotlin/io/architecture/model/UpstreamRtt.kt index 6aac084..e8422f1 100644 --- a/core/model/src/main/java/io/architecture/model/UpstreamRtt.kt +++ b/core/model/src/commonMain/kotlin/io/architecture/model/UpstreamRtt.kt @@ -1,4 +1,6 @@ package io.architecture.model +import kotlin.jvm.JvmInline + @JvmInline value class UpstreamRtt(val value: Long) diff --git a/core/runtime/logging/build.gradle.kts b/core/runtime/logging/build.gradle.kts index 88da1d4..9aa7921 100644 --- a/core/runtime/logging/build.gradle.kts +++ b/core/runtime/logging/build.gradle.kts @@ -1,7 +1,20 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -dependencies { +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() } \ No newline at end of file diff --git a/core/runtime/logging/src/main/java/io/architecture/runtime/logging/Logger.kt b/core/runtime/logging/src/commonMain/kotlin/io/architecture/runtime/logging/Logger.kt similarity index 100% rename from core/runtime/logging/src/main/java/io/architecture/runtime/logging/Logger.kt rename to core/runtime/logging/src/commonMain/kotlin/io/architecture/runtime/logging/Logger.kt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7a6f388..54016ee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,6 +15,7 @@ kotlinxSerializationJsonVersion = "1.6.3" kotlinxSerializationProtobufVersion = "1.6.3" kotlinxCoroutineAndroid = "1.7.3" kotlinxCoroutineCore = "1.8.0" +kotlinxDatetimeVersion = "0.5.0" # ktor-server ktor = "2.3.8" @@ -121,6 +122,7 @@ kotlinx-coroutine-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines kotlinx-coroutine-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutineCore" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJsonVersion" } kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinxSerializationProtobufVersion" } +kotlinx-detetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetimeVersion" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorVersion" } ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktorVersion" } diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 24530bb..0e1bd02 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -52,6 +52,11 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" +"@js-joda/core@3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273" + integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg== + "@leichtgewicht/ip-codec@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" From cf9507bc8957f87be851ee436d24065f4d68b126 Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 25 Feb 2024 16:54:39 +0200 Subject: [PATCH 10/32] Migrated jvm-targeted :core:data, :core:database/datasource:api and :core:network:websocket:api to multiplatform modules --- core/data/build.gradle.kts | 52 +++++++++++-------- .../data/DefaultNodeRepository.kt | 0 .../architecture/data/RepositoryKoinModule.kt | 0 .../data/mapping/RouteMappingExt.kt | 1 + .../data/mapping/TraceMappingExt.kt | 6 ++- .../DefaultConnectionStateRepository.kt | 5 +- .../data/repository/DefaultRouteRepository.kt | 0 .../data/repository/DefaultTraceRepository.kt | 0 .../interfaces/ConnectionStateRepository.kt | 1 - .../repository/interfaces/NodeRepository.kt | 0 .../repository/interfaces/RouteRepository.kt | 0 .../repository/interfaces/TraceRepository.kt | 0 core/database/api/build.gradle.kts | 31 ++++++++--- .../database/api/dao/InterfaceNodeDao.kt | 0 .../database/api/dao/InterfaceRouteDao.kt | 0 .../database/api/dao/InterfaceTraceDao.kt | 0 .../database/api/model/CoordinateEntity.kt | 1 + .../database/api/model/NodeEntity.kt | 1 + .../database/api/model/RouteEntity.kt | 1 + .../database/api/model/TraceEntity.kt | 5 +- core/datasource/api/build.gradle.kts | 32 +++++++++--- .../datasource/api/LocalDataSource.kt | 0 .../datasource/api/NetworkDataSource.kt | 0 core/model/build.gradle.kts | 2 +- core/network/websocket/api/build.gradle.kts | 34 +++++++++--- .../websocket/api/ConnectionEventStreamer.kt | 0 .../network/websocket/api/RouteService.kt | 0 .../network/websocket/api/RttService.kt | 0 .../network/websocket/api/TraceService.kt | 0 .../websocket/api/model/NetworkRoute.kt | 9 ++-- .../websocket/api/model/NetworkTrace.kt | 16 ++++++ .../websocket/api/model/NetworkUpstreamRtt.kt | 13 +++++ .../network/websocket/api/Configuration.kt | 29 ----------- .../websocket/api/model/NetworkTrace.kt | 27 ---------- .../websocket/api/model/NetworkUpstreamRtt.kt | 14 ----- gradle/libs.versions.toml | 2 +- 36 files changed, 156 insertions(+), 126 deletions(-) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/DefaultNodeRepository.kt (100%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/RepositoryKoinModule.kt (100%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/mapping/RouteMappingExt.kt (96%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/mapping/TraceMappingExt.kt (77%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/repository/DefaultConnectionStateRepository.kt (91%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/repository/DefaultRouteRepository.kt (100%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/repository/DefaultTraceRepository.kt (100%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/repository/interfaces/ConnectionStateRepository.kt (92%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/repository/interfaces/NodeRepository.kt (100%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/repository/interfaces/RouteRepository.kt (100%) rename core/data/src/{main/java => commonMain/kotlin}/io/architecture/data/repository/interfaces/TraceRepository.kt (100%) rename core/database/api/src/{main/java => commonMain/kotlin}/io/architecture/database/api/dao/InterfaceNodeDao.kt (100%) rename core/database/api/src/{main/java => commonMain/kotlin}/io/architecture/database/api/dao/InterfaceRouteDao.kt (100%) rename core/database/api/src/{main/java => commonMain/kotlin}/io/architecture/database/api/dao/InterfaceTraceDao.kt (100%) rename core/database/api/src/{main/java => commonMain/kotlin}/io/architecture/database/api/model/CoordinateEntity.kt (95%) rename core/database/api/src/{main/java => commonMain/kotlin}/io/architecture/database/api/model/NodeEntity.kt (95%) rename core/database/api/src/{main/java => commonMain/kotlin}/io/architecture/database/api/model/RouteEntity.kt (96%) rename core/database/api/src/{main/java => commonMain/kotlin}/io/architecture/database/api/model/TraceEntity.kt (89%) rename core/datasource/api/src/{main/java => commonMain/kotlin}/io/architecture/datasource/api/LocalDataSource.kt (100%) rename core/datasource/api/src/{main/java => commonMain/kotlin}/io/architecture/datasource/api/NetworkDataSource.kt (100%) rename core/network/websocket/api/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/api/ConnectionEventStreamer.kt (100%) rename core/network/websocket/api/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/api/RouteService.kt (100%) rename core/network/websocket/api/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/api/RttService.kt (100%) rename core/network/websocket/api/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/api/TraceService.kt (100%) rename core/network/websocket/api/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/api/model/NetworkRoute.kt (73%) create mode 100644 core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkTrace.kt create mode 100644 core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt delete mode 100644 core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/Configuration.kt delete mode 100644 core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkTrace.kt delete mode 100644 core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 97f28d2..54b0993 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -1,27 +1,37 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed -plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.ksp) -} +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl -sourceSets.main { - java.srcDirs("build/generated/ksp/main/kotlin") +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() -dependencies { - implementation(projects.core.common) - implementation(projects.core.database.api) - implementation(projects.core.datasource.api) - implementation(projects.core.model) - implementation(projects.core.network.websocket.api) - implementation(projects.core.runtime.logging) - - implementation(libs.kotlinx.coroutine.core) - - // Koin - implementation(libs.koin.core) - ksp(libs.koin.ksp.compiler) + sourceSets { + val commonMain by getting { + dependencies { + implementation(projects.core.common) + implementation(projects.core.database.api) + implementation(projects.core.datasource.api) + implementation(projects.core.model) + implementation(projects.core.network.websocket.api) + implementation(projects.core.runtime.logging) - testImplementation(libs.junit.junit) + implementation(libs.koin.core) + implementation(libs.kotlinx.coroutine.core) + implementation(libs.kotlinx.datetime) + } + } + } } \ No newline at end of file diff --git a/core/data/src/main/java/io/architecture/data/DefaultNodeRepository.kt b/core/data/src/commonMain/kotlin/io/architecture/data/DefaultNodeRepository.kt similarity index 100% rename from core/data/src/main/java/io/architecture/data/DefaultNodeRepository.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/DefaultNodeRepository.kt diff --git a/core/data/src/main/java/io/architecture/data/RepositoryKoinModule.kt b/core/data/src/commonMain/kotlin/io/architecture/data/RepositoryKoinModule.kt similarity index 100% rename from core/data/src/main/java/io/architecture/data/RepositoryKoinModule.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/RepositoryKoinModule.kt diff --git a/core/data/src/main/java/io/architecture/data/mapping/RouteMappingExt.kt b/core/data/src/commonMain/kotlin/io/architecture/data/mapping/RouteMappingExt.kt similarity index 96% rename from core/data/src/main/java/io/architecture/data/mapping/RouteMappingExt.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/mapping/RouteMappingExt.kt index 5ec1e94..643d4c5 100644 --- a/core/data/src/main/java/io/architecture/data/mapping/RouteMappingExt.kt +++ b/core/data/src/commonMain/kotlin/io/architecture/data/mapping/RouteMappingExt.kt @@ -5,6 +5,7 @@ import io.architecture.database.api.model.RouteEntity import io.architecture.database.api.model.toExternal import io.architecture.model.Route import io.architecture.network.websocket.api.model.NetworkRoute +import kotlin.jvm.JvmName internal fun NetworkRoute.toLocal() = RouteEntity( diff --git a/core/data/src/main/java/io/architecture/data/mapping/TraceMappingExt.kt b/core/data/src/commonMain/kotlin/io/architecture/data/mapping/TraceMappingExt.kt similarity index 77% rename from core/data/src/main/java/io/architecture/data/mapping/TraceMappingExt.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/mapping/TraceMappingExt.kt index 27f0575..5a1019a 100644 --- a/core/data/src/main/java/io/architecture/data/mapping/TraceMappingExt.kt +++ b/core/data/src/commonMain/kotlin/io/architecture/data/mapping/TraceMappingExt.kt @@ -4,7 +4,9 @@ import io.architecture.database.api.model.TraceEntity import io.architecture.model.Node import io.architecture.model.Trace import io.architecture.network.websocket.api.model.NetworkTrace -import java.util.Date +import kotlinx.datetime.Instant +import kotlinx.datetime.TimeZone +import kotlinx.datetime.toLocalDateTime internal fun Trace.toNode() = Node(id = nodeId, mode = 1) // TODO mode is always ACTIVE @@ -12,7 +14,7 @@ internal fun Trace.toNode() = Node(id = nodeId, mode = 1) // TODO mode is always internal fun NetworkTrace.toLocal() = TraceEntity( nodeId = nodeId, lon = lon, - sentAtTime = Date(sentAtTime), + sentAtTime = Instant.parse(sentAtTime.toString()).toLocalDateTime(TimeZone.UTC), // TODO look up details speed = speed, azimuth = azimuth, alt = alt, diff --git a/core/data/src/main/java/io/architecture/data/repository/DefaultConnectionStateRepository.kt b/core/data/src/commonMain/kotlin/io/architecture/data/repository/DefaultConnectionStateRepository.kt similarity index 91% rename from core/data/src/main/java/io/architecture/data/repository/DefaultConnectionStateRepository.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/repository/DefaultConnectionStateRepository.kt index aa67e03..3123471 100644 --- a/core/data/src/main/java/io/architecture/data/repository/DefaultConnectionStateRepository.kt +++ b/core/data/src/commonMain/kotlin/io/architecture/data/repository/DefaultConnectionStateRepository.kt @@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart +import kotlinx.datetime.Clock import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds @@ -38,7 +39,7 @@ class DefaultConnectionStateRepository( ) sendClientTimeWith(2.seconds) // TODO Start on connection opened state } - .map { serverTime -> UpstreamRtt(System.currentTimeMillis() - serverTime.clientSentTime) } + .map { serverTime -> UpstreamRtt(Clock.System.now().toEpochMilliseconds() - serverTime.clientSentTime) } .onEach { sendClientTimeWith(interval) } .catch { error -> Logger.error("RTT_NETWORK", "streamRoundTripTime ", error) } .flowOn(ioDispatcher) @@ -46,7 +47,7 @@ class DefaultConnectionStateRepository( private suspend fun sendClientTimeWith(interval: Duration) { delay(interval) try { - network.sendClientTime(NetworkClientTime(System.currentTimeMillis())) + network.sendClientTime(NetworkClientTime(Clock.System.now().toEpochMilliseconds())) // TODO Look up deatils } catch (exception: Exception) { Logger.error("RTT_NETWORK", "sendClientTimeWith: error -> ", exception) } diff --git a/core/data/src/main/java/io/architecture/data/repository/DefaultRouteRepository.kt b/core/data/src/commonMain/kotlin/io/architecture/data/repository/DefaultRouteRepository.kt similarity index 100% rename from core/data/src/main/java/io/architecture/data/repository/DefaultRouteRepository.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/repository/DefaultRouteRepository.kt diff --git a/core/data/src/main/java/io/architecture/data/repository/DefaultTraceRepository.kt b/core/data/src/commonMain/kotlin/io/architecture/data/repository/DefaultTraceRepository.kt similarity index 100% rename from core/data/src/main/java/io/architecture/data/repository/DefaultTraceRepository.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/repository/DefaultTraceRepository.kt diff --git a/core/data/src/main/java/io/architecture/data/repository/interfaces/ConnectionStateRepository.kt b/core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/ConnectionStateRepository.kt similarity index 92% rename from core/data/src/main/java/io/architecture/data/repository/interfaces/ConnectionStateRepository.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/ConnectionStateRepository.kt index 6298a1d..cea2372 100644 --- a/core/data/src/main/java/io/architecture/data/repository/interfaces/ConnectionStateRepository.kt +++ b/core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/ConnectionStateRepository.kt @@ -1,6 +1,5 @@ package io.architecture.data.repository.interfaces -import io.architecture.model.Connection import io.architecture.model.ConnectionEvent import io.architecture.model.UpstreamRtt import kotlinx.coroutines.flow.Flow diff --git a/core/data/src/main/java/io/architecture/data/repository/interfaces/NodeRepository.kt b/core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/NodeRepository.kt similarity index 100% rename from core/data/src/main/java/io/architecture/data/repository/interfaces/NodeRepository.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/NodeRepository.kt diff --git a/core/data/src/main/java/io/architecture/data/repository/interfaces/RouteRepository.kt b/core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/RouteRepository.kt similarity index 100% rename from core/data/src/main/java/io/architecture/data/repository/interfaces/RouteRepository.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/RouteRepository.kt diff --git a/core/data/src/main/java/io/architecture/data/repository/interfaces/TraceRepository.kt b/core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/TraceRepository.kt similarity index 100% rename from core/data/src/main/java/io/architecture/data/repository/interfaces/TraceRepository.kt rename to core/data/src/commonMain/kotlin/io/architecture/data/repository/interfaces/TraceRepository.kt diff --git a/core/database/api/build.gradle.kts b/core/database/api/build.gradle.kts index db9d463..6685cdd 100644 --- a/core/database/api/build.gradle.kts +++ b/core/database/api/build.gradle.kts @@ -1,11 +1,30 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -dependencies { - implementation(projects.core.common) - implementation(projects.core.model) +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() + + sourceSets { + commonMain.dependencies { + implementation(projects.core.common) + implementation(projects.core.model) - implementation(libs.kotlinx.coroutine.core) + implementation(libs.kotlinx.datetime) + implementation(libs.kotlinx.coroutine.core) + } + } } \ No newline at end of file diff --git a/core/database/api/src/main/java/io/architecture/database/api/dao/InterfaceNodeDao.kt b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/dao/InterfaceNodeDao.kt similarity index 100% rename from core/database/api/src/main/java/io/architecture/database/api/dao/InterfaceNodeDao.kt rename to core/database/api/src/commonMain/kotlin/io/architecture/database/api/dao/InterfaceNodeDao.kt diff --git a/core/database/api/src/main/java/io/architecture/database/api/dao/InterfaceRouteDao.kt b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/dao/InterfaceRouteDao.kt similarity index 100% rename from core/database/api/src/main/java/io/architecture/database/api/dao/InterfaceRouteDao.kt rename to core/database/api/src/commonMain/kotlin/io/architecture/database/api/dao/InterfaceRouteDao.kt diff --git a/core/database/api/src/main/java/io/architecture/database/api/dao/InterfaceTraceDao.kt b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/dao/InterfaceTraceDao.kt similarity index 100% rename from core/database/api/src/main/java/io/architecture/database/api/dao/InterfaceTraceDao.kt rename to core/database/api/src/commonMain/kotlin/io/architecture/database/api/dao/InterfaceTraceDao.kt diff --git a/core/database/api/src/main/java/io/architecture/database/api/model/CoordinateEntity.kt b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/CoordinateEntity.kt similarity index 95% rename from core/database/api/src/main/java/io/architecture/database/api/model/CoordinateEntity.kt rename to core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/CoordinateEntity.kt index 337e539..6d4264d 100644 --- a/core/database/api/src/main/java/io/architecture/database/api/model/CoordinateEntity.kt +++ b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/CoordinateEntity.kt @@ -1,6 +1,7 @@ package io.architecture.database.api.model import io.architecture.model.Coordinate +import kotlin.jvm.JvmName open class CoordinateEntity( open val lat: Double, diff --git a/core/database/api/src/main/java/io/architecture/database/api/model/NodeEntity.kt b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/NodeEntity.kt similarity index 95% rename from core/database/api/src/main/java/io/architecture/database/api/model/NodeEntity.kt rename to core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/NodeEntity.kt index ed99da3..9a40336 100644 --- a/core/database/api/src/main/java/io/architecture/database/api/model/NodeEntity.kt +++ b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/NodeEntity.kt @@ -2,6 +2,7 @@ package io.architecture.database.api.model import io.architecture.model.Node import io.architecture.model.NodeMode +import kotlin.jvm.JvmName open class NodeEntity( diff --git a/core/database/api/src/main/java/io/architecture/database/api/model/RouteEntity.kt b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/RouteEntity.kt similarity index 96% rename from core/database/api/src/main/java/io/architecture/database/api/model/RouteEntity.kt rename to core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/RouteEntity.kt index d84a3ed..ea64826 100644 --- a/core/database/api/src/main/java/io/architecture/database/api/model/RouteEntity.kt +++ b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/RouteEntity.kt @@ -2,6 +2,7 @@ package io.architecture.database.api.model import io.architecture.model.Coordinate import io.architecture.model.Route +import kotlin.jvm.JvmName open class RouteEntity( diff --git a/core/database/api/src/main/java/io/architecture/database/api/model/TraceEntity.kt b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/TraceEntity.kt similarity index 89% rename from core/database/api/src/main/java/io/architecture/database/api/model/TraceEntity.kt rename to core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/TraceEntity.kt index 4176154..ef8b254 100644 --- a/core/database/api/src/main/java/io/architecture/database/api/model/TraceEntity.kt +++ b/core/database/api/src/commonMain/kotlin/io/architecture/database/api/model/TraceEntity.kt @@ -1,7 +1,8 @@ package io.architecture.database.api.model import io.architecture.model.Trace -import java.util.Date +import kotlinx.datetime.LocalDateTime +import kotlin.jvm.JvmName open class TraceEntity( open var nodeId: String, @@ -10,7 +11,7 @@ open class TraceEntity( open var speed: Int, open var azimuth: Double, open var alt: Double, - open var sentAtTime: Date, + open var sentAtTime: LocalDateTime, ) fun T.toExternal(): Trace = Trace( diff --git a/core/datasource/api/build.gradle.kts b/core/datasource/api/build.gradle.kts index 36270c8..27294d9 100644 --- a/core/datasource/api/build.gradle.kts +++ b/core/datasource/api/build.gradle.kts @@ -1,12 +1,30 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -dependencies { - implementation(projects.core.model) - implementation(projects.core.database.api) - implementation(projects.core.network.websocket.api) +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() + + sourceSets { + commonMain.dependencies { + implementation(projects.core.model) + implementation(projects.core.database.api) + implementation(projects.core.network.websocket.api) - implementation(libs.kotlinx.coroutine.core) + implementation(libs.kotlinx.coroutine.core) + } + } } \ No newline at end of file diff --git a/core/datasource/api/src/main/java/io/architecture/datasource/api/LocalDataSource.kt b/core/datasource/api/src/commonMain/kotlin/io/architecture/datasource/api/LocalDataSource.kt similarity index 100% rename from core/datasource/api/src/main/java/io/architecture/datasource/api/LocalDataSource.kt rename to core/datasource/api/src/commonMain/kotlin/io/architecture/datasource/api/LocalDataSource.kt diff --git a/core/datasource/api/src/main/java/io/architecture/datasource/api/NetworkDataSource.kt b/core/datasource/api/src/commonMain/kotlin/io/architecture/datasource/api/NetworkDataSource.kt similarity index 100% rename from core/datasource/api/src/main/java/io/architecture/datasource/api/NetworkDataSource.kt rename to core/datasource/api/src/commonMain/kotlin/io/architecture/datasource/api/NetworkDataSource.kt diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index 1287302..cc05ef6 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -20,7 +20,7 @@ kotlin { sourceSets { commonMain.dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0") + implementation(libs.kotlinx.datetime) } } } \ No newline at end of file diff --git a/core/network/websocket/api/build.gradle.kts b/core/network/websocket/api/build.gradle.kts index 516c67c..48699d1 100644 --- a/core/network/websocket/api/build.gradle.kts +++ b/core/network/websocket/api/build.gradle.kts @@ -1,15 +1,33 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) alias(libs.plugins.kotlin.serialize) } -dependencies { - implementation(projects.core.model) - implementation(libs.gson) +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() + + sourceSets { + commonMain.dependencies { + implementation(projects.core.model) + implementation(libs.gson) - implementation(libs.kotlinx.coroutine.core) + implementation(libs.kotlinx.coroutine.core) - implementation(libs.kotlinx.serialization.json) - implementation(libs.kotlinx.serialization.protobuf) + implementation(libs.kotlinx.serialization.json) + implementation(libs.kotlinx.serialization.protobuf) + } + } } \ No newline at end of file diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/ConnectionEventStreamer.kt b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/ConnectionEventStreamer.kt similarity index 100% rename from core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/ConnectionEventStreamer.kt rename to core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/ConnectionEventStreamer.kt diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/RouteService.kt b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/RouteService.kt similarity index 100% rename from core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/RouteService.kt rename to core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/RouteService.kt diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/RttService.kt b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/RttService.kt similarity index 100% rename from core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/RttService.kt rename to core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/RttService.kt diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/TraceService.kt b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/TraceService.kt similarity index 100% rename from core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/TraceService.kt rename to core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/TraceService.kt diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkRoute.kt b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkRoute.kt similarity index 73% rename from core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkRoute.kt rename to core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkRoute.kt index 4fd50e4..bd70674 100644 --- a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkRoute.kt +++ b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkRoute.kt @@ -1,17 +1,16 @@ package io.architecture.network.websocket.api.model -import com.google.gson.annotations.SerializedName import kotlinx.serialization.Serializable @Serializable data class NetworkRoute( - @SerializedName("type") var type: String = "", - @SerializedName("n") var nodeId: String, - @SerializedName("r") var route: Array? + // TODO Removed Gson, provide actual-expected for network models + var type: String = "", + var nodeId: String, + var route: Array?, ) { override fun equals(other: Any?): Boolean { if (this === other) return true - if (javaClass != other?.javaClass) return false other as NetworkRoute diff --git a/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkTrace.kt b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkTrace.kt new file mode 100644 index 0000000..6797e63 --- /dev/null +++ b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkTrace.kt @@ -0,0 +1,16 @@ +package io.architecture.network.websocket.api.model + +import kotlinx.serialization.Serializable + +@Serializable +data class NetworkTrace( + var type: String = "", + var lon: Double = 0.0, + var lat: Double = 0.0, + var speed: Int = 0, + var azimuth: Double = 0.0, + var alt: Double = 0.0, + var sentAtTime: Long = 0, + var nodeId: String = "", + var mode: Int = 0, +) \ No newline at end of file diff --git a/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt new file mode 100644 index 0000000..e6ceab8 --- /dev/null +++ b/core/network/websocket/api/src/commonMain/kotlin/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt @@ -0,0 +1,13 @@ +package io.architecture.network.websocket.api.model + +import kotlinx.serialization.Serializable + +@Serializable +data class NetworkServerTime( + var type: String = "", + var clientSentTime: Long = 0, + var serverTime: Long = 0, +) + +@Serializable +data class NetworkClientTime(val time: Long) \ No newline at end of file diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/Configuration.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/Configuration.kt deleted file mode 100644 index 4c84c9d..0000000 --- a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/Configuration.kt +++ /dev/null @@ -1,29 +0,0 @@ -package io.architecture.network.websocket.api - -//@Module -//@InstallIn(SingletonComponent::class) -//object BaseWebsocketModule { -// -// @Provides -// @Singleton -// fun provideEnabledWebsocketClientProvider(): WebsocketClientProvider = -// WebsocketClientProvider.KTOR_PROTOBUF -// -//} - -const val BASE_WS_HOST = "192.168.1.197" -const val BASE_WS_PORT = 8080 -const val BASE_WS_URL = "ws://$BASE_WS_HOST}:$BASE_WS_PORT" - -// Scarlet uses: -const val NODE_TRACES_WS_URL = "$BASE_WS_URL/nodes/traces" -const val NODE_ROUTES_WS_URL = "$BASE_WS_URL/nodes/routes" - -// Ktor uses: -const val NODE_TRACES_WS_PATH = "/nodes/traces" -const val NODE_ROUTES_WS_PATH = "/nodes/routes" -const val RTT_WS_PATH = "/rtt" - -enum class WebsocketClientProvider { - SCARLET_GSON, KTOR_PROTOBUF -} \ No newline at end of file diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkTrace.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkTrace.kt deleted file mode 100644 index 354bc2f..0000000 --- a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkTrace.kt +++ /dev/null @@ -1,27 +0,0 @@ -package io.architecture.network.websocket.api.model - -import com.google.gson.annotations.SerializedName -import kotlinx.serialization.Serializable - -// Example of payload -// "l": 30.52323011454044, -// "lt": 42.725705657669245, -// "s": 13, -// "az": 3.4595129834094243, -// "a": 0.1, -// "t": 1706894164046, -// "n": "bb0c326c-c1ee-11ee-b86a-d106324846e3", -// "m": 1 - -@Serializable -data class NetworkTrace( - @SerializedName("type") var type: String = "", - @SerializedName("l") var lon: Double = 0.0, - @SerializedName("lt") var lat: Double = 0.0, - @SerializedName("s") var speed: Int = 0, - @SerializedName("az") var azimuth: Double = 0.0, - @SerializedName("a") var alt: Double = 0.0, - @SerializedName("t") var sentAtTime: Long = 0, - @SerializedName("n") var nodeId: String = "", - @SerializedName("m") var mode: Int = 0 -) \ No newline at end of file diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt deleted file mode 100644 index be0818d..0000000 --- a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt +++ /dev/null @@ -1,14 +0,0 @@ -package io.architecture.network.websocket.api.model - -import com.google.gson.annotations.SerializedName -import kotlinx.serialization.Serializable - -@Serializable -data class NetworkServerTime( - @SerializedName("type") var type: String = "", - @SerializedName("clientSentTime") var clientSentTime: Long = 0, - @SerializedName("serverTime") var serverTime: Long = 0 -) - -@Serializable -data class NetworkClientTime(val time: Long) \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 54016ee..4eace75 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -122,7 +122,7 @@ kotlinx-coroutine-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines kotlinx-coroutine-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutineCore" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJsonVersion" } kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinxSerializationProtobufVersion" } -kotlinx-detetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetimeVersion" } +kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetimeVersion" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorVersion" } ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktorVersion" } From 6ce5c7296f06b6e1158d97e2c276d049bd8dfa33 Mon Sep 17 00:00:00 2001 From: dev Date: Sun, 25 Feb 2024 22:34:32 +0200 Subject: [PATCH 11/32] Migrated other jvm-targeted :core:* to multiplatform modules, removed java imports and rewritten Koin modules without annotations --- .../io/architecture/playground/MapActivity.kt | 4 +- .../androidMain/res/xml/network_security.xml | 2 +- compose-common/build.gradle.kts | 48 ------------ compose-desktop-app/build.gradle.kts | 1 - .../data/mapping/TraceMappingExt.kt | 2 +- core/database/imp/room/build.gradle.kts | 2 + .../imp/room/convertors/DateTypeConvertor.kt | 19 +++-- .../imp/room/entity/RoomTraceEntity.kt | 4 +- core/designsystem/build.gradle.kts | 49 +++++++----- .../core/design/system/theme/Color.kt | 0 core/di/build.gradle.kts | 62 ++++++++------- .../io/architecture/core/di/CoreKoinModule.kt | 3 +- .../core/di/CoroutineDispatcherKoinModule.kt | 20 ++--- .../core/di/CoroutineKoinModule.kt | 9 +-- .../core/di/CoroutineScopeKoinModule.kt | 34 ++++----- .../core/di/CoreKoinCheckModulesTest.kt | 6 +- core/domain/build.gradle.kts | 43 +++++++---- .../ConvertAzimuthToDirectionUseCase.kt | 0 .../domain/FormatDatetimeUseCase.kt | 16 ++++ .../domain/GetConnectionStateUseCase.kt | 0 .../GetStreamChunkedNodeWithTraceUseCase.kt | 0 .../domain/GetStreamTraceByIdUseCase.kt | 0 .../domain/PersistRoutesUseCase.kt | 0 .../domain/di/UseCaseKoinModule.kt | 0 .../domain/FormatDatetimeUseCase.kt | 18 ----- .../websocket/imp/ktor/build.gradle.kts | 75 ++++++++++++------- .../imp/ktor/KtorNetworkDataSource.kt | 0 .../websocket/imp/ktor/KtorRouteService.kt | 0 .../websocket/imp/ktor/KtorRttService.kt | 0 .../websocket/imp/ktor/KtorTraceService.kt | 0 .../imp/ktor/di/KtorClientKoinModule.kt | 24 +++--- .../websocket/imp/ktor/di/KtorKoinModule.kt | 7 +- .../imp/ktor/di/KtorServiceKoinModule.kt | 0 .../imp/ktor/internal/KtorProtobufClient.kt | 0 core/pool/build.gradle.kts | 45 ++++++----- core/ui/build.gradle.kts | 48 +++++++----- gradle.properties | 10 ++- gradle/libs.versions.toml | 20 +++-- kotlin-js-store/yarn.lock | 42 +++++++++++ settings.gradle.kts | 4 +- 40 files changed, 338 insertions(+), 279 deletions(-) delete mode 100644 compose-common/build.gradle.kts rename core/designsystem/src/{main/java => commonMain/kotlin}/io/architecture/core/design/system/theme/Color.kt (100%) rename core/domain/src/{main/java => commonMain/kotlin}/io/architecture/domain/ConvertAzimuthToDirectionUseCase.kt (100%) create mode 100644 core/domain/src/commonMain/kotlin/io/architecture/domain/FormatDatetimeUseCase.kt rename core/domain/src/{main/java => commonMain/kotlin}/io/architecture/domain/GetConnectionStateUseCase.kt (100%) rename core/domain/src/{main/java => commonMain/kotlin}/io/architecture/domain/GetStreamChunkedNodeWithTraceUseCase.kt (100%) rename core/domain/src/{main/java => commonMain/kotlin}/io/architecture/domain/GetStreamTraceByIdUseCase.kt (100%) rename core/domain/src/{main/java => commonMain/kotlin}/io/architecture/domain/PersistRoutesUseCase.kt (100%) rename core/domain/src/{main/java => commonMain/kotlin}/io/architecture/domain/di/UseCaseKoinModule.kt (100%) delete mode 100644 core/domain/src/main/java/io/architecture/domain/FormatDatetimeUseCase.kt rename core/network/websocket/imp/ktor/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/imp/ktor/KtorNetworkDataSource.kt (100%) rename core/network/websocket/imp/ktor/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/imp/ktor/KtorRouteService.kt (100%) rename core/network/websocket/imp/ktor/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/imp/ktor/KtorRttService.kt (100%) rename core/network/websocket/imp/ktor/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/imp/ktor/KtorTraceService.kt (100%) rename core/network/websocket/imp/ktor/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/imp/ktor/di/KtorClientKoinModule.kt (63%) rename core/network/websocket/imp/ktor/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/imp/ktor/di/KtorKoinModule.kt (78%) rename core/network/websocket/imp/ktor/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/imp/ktor/di/KtorServiceKoinModule.kt (100%) rename core/network/websocket/imp/ktor/src/{main/java => commonMain/kotlin}/io/architecture/network/websocket/imp/ktor/internal/KtorProtobufClient.kt (100%) diff --git a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt index 9a1fb22..395a5ca 100644 --- a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt +++ b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt @@ -16,8 +16,8 @@ class MapActivity : ComponentActivity() { setContent { KoinContext { -// MapScreen() - AppWrapper() + MapScreen() +// AppWrapper() } } diff --git a/compose-android-app/src/androidMain/res/xml/network_security.xml b/compose-android-app/src/androidMain/res/xml/network_security.xml index fbd4839..550782b 100644 --- a/compose-android-app/src/androidMain/res/xml/network_security.xml +++ b/compose-android-app/src/androidMain/res/xml/network_security.xml @@ -1,6 +1,6 @@ - 192.168.1.*** + 192.168.1.197 \ No newline at end of file diff --git a/compose-common/build.gradle.kts b/compose-common/build.gradle.kts deleted file mode 100644 index 9a1145e..0000000 --- a/compose-common/build.gradle.kts +++ /dev/null @@ -1,48 +0,0 @@ -import org.jetbrains.compose.ExperimentalComposeLibrary -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl - -plugins { - alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.convention.android.library) - alias(libs.plugins.jetbrainsCompose) -} - -kotlin { - // Apply the default hierarchy again - applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } - - androidTarget() - - listOf( - iosX64(), - iosArm64(), - iosSimulatorArm64() - ).forEach { - it.binaries.framework { - baseName = "shared" - isStatic = true - } - } - - jvm() - - sourceSets { - val commonMain by getting { - dependencies { - implementation(libs.koin.core) - implementation(libs.koin.mp.compose) - - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material) - implementation(compose.ui) - @OptIn(ExperimentalComposeLibrary::class) - implementation(compose.components.resources) - } - } - } -} diff --git a/compose-desktop-app/build.gradle.kts b/compose-desktop-app/build.gradle.kts index b1b9fea..41ae3f7 100644 --- a/compose-desktop-app/build.gradle.kts +++ b/compose-desktop-app/build.gradle.kts @@ -12,7 +12,6 @@ kotlin { sourceSets { val desktopMain by getting desktopMain.dependencies { - implementation(projects.composeCommon) implementation(compose.desktop.currentOs) implementation(projects.shared) diff --git a/core/data/src/commonMain/kotlin/io/architecture/data/mapping/TraceMappingExt.kt b/core/data/src/commonMain/kotlin/io/architecture/data/mapping/TraceMappingExt.kt index 5a1019a..476f189 100644 --- a/core/data/src/commonMain/kotlin/io/architecture/data/mapping/TraceMappingExt.kt +++ b/core/data/src/commonMain/kotlin/io/architecture/data/mapping/TraceMappingExt.kt @@ -14,7 +14,7 @@ internal fun Trace.toNode() = Node(id = nodeId, mode = 1) // TODO mode is always internal fun NetworkTrace.toLocal() = TraceEntity( nodeId = nodeId, lon = lon, - sentAtTime = Instant.parse(sentAtTime.toString()).toLocalDateTime(TimeZone.UTC), // TODO look up details + sentAtTime = Instant.fromEpochMilliseconds(sentAtTime).toLocalDateTime(TimeZone.UTC), speed = speed, azimuth = azimuth, alt = alt, diff --git a/core/database/imp/room/build.gradle.kts b/core/database/imp/room/build.gradle.kts index a1dbe86..23e31ae 100644 --- a/core/database/imp/room/build.gradle.kts +++ b/core/database/imp/room/build.gradle.kts @@ -33,6 +33,8 @@ dependencies { implementation(projects.core.datasource.api) implementation(projects.core.model) + implementation(libs.kotlinx.datetime) + // Room implementation(libs.androidx.room.runtime) implementation(libs.androidx.material3) diff --git a/core/database/imp/room/src/main/java/io/architecture/database/imp/room/convertors/DateTypeConvertor.kt b/core/database/imp/room/src/main/java/io/architecture/database/imp/room/convertors/DateTypeConvertor.kt index 8295750..0ddfbf5 100644 --- a/core/database/imp/room/src/main/java/io/architecture/database/imp/room/convertors/DateTypeConvertor.kt +++ b/core/database/imp/room/src/main/java/io/architecture/database/imp/room/convertors/DateTypeConvertor.kt @@ -1,15 +1,24 @@ package io.architecture.database.imp.room.convertors +import android.os.Build +import androidx.annotation.RequiresApi import androidx.room.TypeConverter -import java.util.Date - +import kotlinx.datetime.LocalDateTime internal class DateTypeConvertor { + @RequiresApi(Build.VERSION_CODES.O) @TypeConverter - fun fromTimestamp(value: Long?): Date? = value?.let { Date(it) } + fun toDate(dateString: String?): LocalDateTime? { + return if (dateString == null) { + null + } else { + LocalDateTime.parse(dateString) + } + } @TypeConverter - fun dateToTimestamp(date: Date?): Long? = date?.time - + fun toDateString(date: LocalDateTime?): String? { + return date?.toString() + } } \ No newline at end of file diff --git a/core/database/imp/room/src/main/java/io/architecture/database/imp/room/entity/RoomTraceEntity.kt b/core/database/imp/room/src/main/java/io/architecture/database/imp/room/entity/RoomTraceEntity.kt index b8f30a5..f116ef8 100644 --- a/core/database/imp/room/src/main/java/io/architecture/database/imp/room/entity/RoomTraceEntity.kt +++ b/core/database/imp/room/src/main/java/io/architecture/database/imp/room/entity/RoomTraceEntity.kt @@ -4,7 +4,7 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey import io.architecture.database.api.model.TraceEntity -import java.util.Date +import kotlinx.datetime.LocalDateTime @Entity( tableName = "traces" @@ -18,7 +18,7 @@ internal data class RoomTraceEntity( override var speed: Int, override var azimuth: Double, override var alt: Double, - override var sentAtTime: Date, + override var sentAtTime: LocalDateTime, ) : TraceEntity(nodeId, lon, lat, speed, azimuth, alt, sentAtTime) { companion object { diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index c565a82..8c2ca0e 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -1,27 +1,36 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.compose.ExperimentalComposeLibrary +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.androidLibrary) - alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) + alias(libs.plugins.jetbrainsCompose) } -android { - namespace = "io.architecture.core.design.system" - compileSdk = libs.versions.compileSdk.get().toInt() +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() + sourceSets { + commonMain.dependencies { + implementation(libs.koin.core) + implementation(libs.koin.mp.compose) - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = libs.versions.jvmTarget.get() + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + @OptIn(ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + } } -} - -dependencies { - implementation(libs.androidx.coreKtx) - testImplementation(libs.junit.junit) - implementation(libs.androidx.ui.graphics.android) - androidTestImplementation(libs.junit) - androidTestImplementation(libs.espresso.core) } \ No newline at end of file diff --git a/core/designsystem/src/main/java/io/architecture/core/design/system/theme/Color.kt b/core/designsystem/src/commonMain/kotlin/io/architecture/core/design/system/theme/Color.kt similarity index 100% rename from core/designsystem/src/main/java/io/architecture/core/design/system/theme/Color.kt rename to core/designsystem/src/commonMain/kotlin/io/architecture/core/design/system/theme/Color.kt diff --git a/core/di/build.gradle.kts b/core/di/build.gradle.kts index 2dfdc09..a2f5f4a 100644 --- a/core/di/build.gradle.kts +++ b/core/di/build.gradle.kts @@ -1,35 +1,41 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed -plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.ksp) -} +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl -sourceSets.main { - java.srcDirs("build/generated/ksp/main/kotlin") +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -dependencies { - implementation(projects.core.common) - implementation(projects.core.domain) - implementation(projects.core.data) - implementation(projects.core.network.websocket.imp.ktor) - implementation(projects.core.runtime.configuration) - - implementation(libs.kotlinx.coroutine.android) - - implementation(libs.koin.core) - implementation(libs.koin.annotations) - implementation(libs.koin.test) - ksp(libs.koin.ksp.compiler) +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() - testImplementation(projects.core.datasource.api) + sourceSets { + commonMain.dependencies { + implementation(projects.core.common) + implementation(projects.core.domain) + implementation(projects.core.data) + implementation(projects.core.network.websocket.imp.ktor) + implementation(projects.core.runtime.configuration) - testImplementation(libs.ktor.client.core) - testImplementation(libs.ktor.client.cio) - testImplementation(libs.ktor.client.websockets) - testImplementation(libs.ktor.client.serialization.jvm) - testImplementation(libs.ktor.serialization.kotlinx.protobuf) - testImplementation(libs.ktor.client.logging.jvm) + implementation(libs.kotlinx.coroutine.core) + implementation(libs.koin.core) + } + commonTest.dependencies { + implementation(projects.core.datasource.api) - testImplementation(libs.junit.junit) + implementation(kotlin("reflect")) + implementation(libs.ktor.client.core) + implementation(libs.koin.test) + implementation(libs.junit.junit) + } + } } \ No newline at end of file diff --git a/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt b/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt index efa169f..a8e36d5 100644 --- a/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt +++ b/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt @@ -7,12 +7,11 @@ import io.architecture.network.websocket.imp.ktor.di.ktorClientModule import io.architecture.network.websocket.imp.ktor.di.ktorModule import io.architecture.network.websocket.imp.ktor.di.ktorServiceModule import org.koin.dsl.module -import org.koin.ksp.generated.module // umbrella module val coreKoinModules = module { includes( - CoroutineKoinModule().module, + coroutineModule, runtimeModule, repositoryModule, useCaseModule, diff --git a/core/di/src/main/java/io/architecture/core/di/CoroutineDispatcherKoinModule.kt b/core/di/src/main/java/io/architecture/core/di/CoroutineDispatcherKoinModule.kt index cf9b303..6079941 100644 --- a/core/di/src/main/java/io/architecture/core/di/CoroutineDispatcherKoinModule.kt +++ b/core/di/src/main/java/io/architecture/core/di/CoroutineDispatcherKoinModule.kt @@ -1,19 +1,11 @@ package io.architecture.core.di -import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers -import org.koin.core.annotation.Module -import org.koin.core.annotation.Named -import org.koin.core.annotation.Single +import org.koin.core.qualifier.named +import org.koin.dsl.module -@Module -internal class CoroutineDispatcherKoinModule { - - @Single - @Named("ioDispatcher") - fun providesIODispatcher(): CoroutineDispatcher = Dispatchers.IO - - @Single - @Named("defaultDispatcher") - fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default +internal val coroutineDispatcherModule = module { + single(named("ioDispatcher")) { Dispatchers.IO } + single(named("defaultDispatcher")) { Dispatchers.Default } + single(named("mainDispatcher")) { Dispatchers.Main } } \ No newline at end of file diff --git a/core/di/src/main/java/io/architecture/core/di/CoroutineKoinModule.kt b/core/di/src/main/java/io/architecture/core/di/CoroutineKoinModule.kt index efe0bc7..632abd5 100644 --- a/core/di/src/main/java/io/architecture/core/di/CoroutineKoinModule.kt +++ b/core/di/src/main/java/io/architecture/core/di/CoroutineKoinModule.kt @@ -1,8 +1,7 @@ package io.architecture.core.di -import org.koin.core.annotation.ComponentScan -import org.koin.core.annotation.Module +import org.koin.dsl.module -@Module(includes = [CoroutineScopeKoinModule::class, CoroutineDispatcherKoinModule::class]) -@ComponentScan("io.architecture.common") -class CoroutineKoinModule \ No newline at end of file +val coroutineModule = module { + includes(coroutineDispatcherModule, coroutineScopeModule) +} \ No newline at end of file diff --git a/core/di/src/main/java/io/architecture/core/di/CoroutineScopeKoinModule.kt b/core/di/src/main/java/io/architecture/core/di/CoroutineScopeKoinModule.kt index 7c1488a..965ddb6 100644 --- a/core/di/src/main/java/io/architecture/core/di/CoroutineScopeKoinModule.kt +++ b/core/di/src/main/java/io/architecture/core/di/CoroutineScopeKoinModule.kt @@ -3,24 +3,24 @@ package io.architecture.core.di import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob -import org.koin.core.annotation.Module -import org.koin.core.annotation.Named -import org.koin.core.annotation.Single +import org.koin.core.qualifier.named +import org.koin.dsl.module -@Module(includes = [CoroutineDispatcherKoinModule::class]) -internal class CoroutineScopeKoinModule { - - @Single - @Named("applicationScope") - fun providesCoroutineScope( - @Named("defaultDispatcher") dispatcher: CoroutineDispatcher, - ): CoroutineScope = CoroutineScope(SupervisorJob() + dispatcher) - - @Single - @Named("applicationIoScope") - fun providesIoCoroutineScope( - @Named("ioDispatcher") dispatcher: CoroutineDispatcher, - ): CoroutineScope = CoroutineScope(SupervisorJob() + dispatcher) +internal val coroutineScopeModule = module { + single(named("applicationScope")) { + CoroutineScope( + SupervisorJob() + get( + named("defaultDispatcher") + ) + ) + } + single(named("applicationIoScope")) { + CoroutineScope( + SupervisorJob() + get( + named("ioDispatcher") + ) + ) + } } diff --git a/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt b/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt index 87fed57..ef38be1 100644 --- a/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt +++ b/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt @@ -11,14 +11,14 @@ import io.architecture.network.websocket.imp.ktor.di.ktorServiceModule import org.junit.Test import org.koin.core.annotation.KoinExperimentalAPI import org.koin.dsl.module -import org.koin.ksp.generated.module import org.koin.test.verify.verify -class CoreKoinCheckModulesTest { +class CoreKoinCheckModulesTest { // TODO Test fails due to kotlin-reflect. Too long (10 mins) to + // sync Gradle project after deps changes (ktor module is slow down build speed) private val coreModule = module { includes( - CoroutineKoinModule().module, + coroutineModule, runtimeModule, repositoryModule, useCaseModule, diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts index 9b29e81..eb7bc2d 100644 --- a/core/domain/build.gradle.kts +++ b/core/domain/build.gradle.kts @@ -1,22 +1,33 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed -plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.ksp) -} +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl -sourceSets.main { - java.srcDirs("build/generated/ksp/main/kotlin") +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -dependencies { - implementation(projects.core.data) - implementation(projects.core.common) - implementation(projects.core.model) - implementation(projects.core.runtime.logging) +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() - implementation(libs.kotlinx.coroutine.core) + sourceSets { + commonMain.dependencies { + implementation(projects.core.data) + implementation(projects.core.common) + implementation(projects.core.model) + implementation(projects.core.runtime.logging) - // Koin - implementation(libs.koin.core) - ksp(libs.koin.ksp.compiler) + implementation(libs.kotlinx.datetime) + implementation(libs.kotlinx.coroutine.core) + implementation(libs.koin.core) + } + } } \ No newline at end of file diff --git a/core/domain/src/main/java/io/architecture/domain/ConvertAzimuthToDirectionUseCase.kt b/core/domain/src/commonMain/kotlin/io/architecture/domain/ConvertAzimuthToDirectionUseCase.kt similarity index 100% rename from core/domain/src/main/java/io/architecture/domain/ConvertAzimuthToDirectionUseCase.kt rename to core/domain/src/commonMain/kotlin/io/architecture/domain/ConvertAzimuthToDirectionUseCase.kt diff --git a/core/domain/src/commonMain/kotlin/io/architecture/domain/FormatDatetimeUseCase.kt b/core/domain/src/commonMain/kotlin/io/architecture/domain/FormatDatetimeUseCase.kt new file mode 100644 index 0000000..341a786 --- /dev/null +++ b/core/domain/src/commonMain/kotlin/io/architecture/domain/FormatDatetimeUseCase.kt @@ -0,0 +1,16 @@ +package io.architecture.domain + +import kotlinx.datetime.LocalDateTime + +class FormatDatetimeUseCase { + + operator fun invoke( + date: LocalDateTime + ): String { + // TODO Better to have user data repository for local and other parameters + // If you target Android devices running below API 26, you need to use Android Gradle plugin 4.0 + // or newer and enable core library desugaring. + // https://github.com/Kotlin/kotlinx-datetime?tab=readme-ov-file#using-in-your-projects + return date.toString() + } +} \ No newline at end of file diff --git a/core/domain/src/main/java/io/architecture/domain/GetConnectionStateUseCase.kt b/core/domain/src/commonMain/kotlin/io/architecture/domain/GetConnectionStateUseCase.kt similarity index 100% rename from core/domain/src/main/java/io/architecture/domain/GetConnectionStateUseCase.kt rename to core/domain/src/commonMain/kotlin/io/architecture/domain/GetConnectionStateUseCase.kt diff --git a/core/domain/src/main/java/io/architecture/domain/GetStreamChunkedNodeWithTraceUseCase.kt b/core/domain/src/commonMain/kotlin/io/architecture/domain/GetStreamChunkedNodeWithTraceUseCase.kt similarity index 100% rename from core/domain/src/main/java/io/architecture/domain/GetStreamChunkedNodeWithTraceUseCase.kt rename to core/domain/src/commonMain/kotlin/io/architecture/domain/GetStreamChunkedNodeWithTraceUseCase.kt diff --git a/core/domain/src/main/java/io/architecture/domain/GetStreamTraceByIdUseCase.kt b/core/domain/src/commonMain/kotlin/io/architecture/domain/GetStreamTraceByIdUseCase.kt similarity index 100% rename from core/domain/src/main/java/io/architecture/domain/GetStreamTraceByIdUseCase.kt rename to core/domain/src/commonMain/kotlin/io/architecture/domain/GetStreamTraceByIdUseCase.kt diff --git a/core/domain/src/main/java/io/architecture/domain/PersistRoutesUseCase.kt b/core/domain/src/commonMain/kotlin/io/architecture/domain/PersistRoutesUseCase.kt similarity index 100% rename from core/domain/src/main/java/io/architecture/domain/PersistRoutesUseCase.kt rename to core/domain/src/commonMain/kotlin/io/architecture/domain/PersistRoutesUseCase.kt diff --git a/core/domain/src/main/java/io/architecture/domain/di/UseCaseKoinModule.kt b/core/domain/src/commonMain/kotlin/io/architecture/domain/di/UseCaseKoinModule.kt similarity index 100% rename from core/domain/src/main/java/io/architecture/domain/di/UseCaseKoinModule.kt rename to core/domain/src/commonMain/kotlin/io/architecture/domain/di/UseCaseKoinModule.kt diff --git a/core/domain/src/main/java/io/architecture/domain/FormatDatetimeUseCase.kt b/core/domain/src/main/java/io/architecture/domain/FormatDatetimeUseCase.kt deleted file mode 100644 index 9c33366..0000000 --- a/core/domain/src/main/java/io/architecture/domain/FormatDatetimeUseCase.kt +++ /dev/null @@ -1,18 +0,0 @@ -package io.architecture.domain - -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale - -class FormatDatetimeUseCase { - - operator fun invoke(date: Date, preferredPattern: String = DEFAULT_DATETIME_FORMAT): String = - SimpleDateFormat( - preferredPattern, - Locale.getDefault() - ).format(date) // TODO Better to have user data repository for local and other parameters - - companion object { - const val DEFAULT_DATETIME_FORMAT: String = "yyyy-MM-dd HH:mm:ss:SSSSSSS" - } -} \ No newline at end of file diff --git a/core/network/websocket/imp/ktor/build.gradle.kts b/core/network/websocket/imp/ktor/build.gradle.kts index d44741a..b3cf6a9 100644 --- a/core/network/websocket/imp/ktor/build.gradle.kts +++ b/core/network/websocket/imp/ktor/build.gradle.kts @@ -1,36 +1,57 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.compose.ExperimentalComposeLibrary +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) alias(libs.plugins.kotlin.serialize) - alias(libs.plugins.ksp) -} - -sourceSets.main { - java.srcDirs("build/generated/ksp/main/kotlin") } -dependencies { - implementation(projects.core.common) - implementation(projects.core.model) - implementation(projects.core.network.websocket.api) - implementation(projects.core.datasource.api) - implementation(projects.core.runtime.logging) +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() - // Koin - implementation(libs.koin.core) - ksp(libs.koin.ksp.compiler) + sourceSets { + commonMain.dependencies { + implementation(projects.core.common) + implementation(projects.core.model) + implementation(projects.core.network.websocket.api) + implementation(projects.core.runtime.configuration) + implementation(projects.core.datasource.api) + implementation(projects.core.runtime.logging) - // kotlinx-serialization - implementation(libs.kotlinx.serialization.json) - implementation(libs.kotlinx.serialization.protobuf) + implementation(libs.koin.core) - // Ktor for Android - implementation(libs.ktor.client.core) - implementation(libs.ktor.client.cio) - implementation(libs.ktor.client.websockets) - implementation(libs.ktor.client.serialization.jvm) - implementation(libs.ktor.serialization.kotlinx.protobuf) - implementation(libs.ktor.client.logging.jvm) + // https://ktor.io/docs/http-client-engines.html#default + implementation(libs.ktor.client.core) + implementation(libs.ktor.client.logging) + implementation(libs.ktor.client.content.negotiation) + implementation(libs.ktor.serialization.kotlinx.protobuf) + implementation(libs.ktor.client.websockets) - testImplementation(libs.junit.junit) + implementation(libs.kotlinx.coroutine.core) + implementation(libs.kotlinx.serialization.core) + } + commonTest.dependencies { + implementation(libs.junit.junit) + } + androidMain.dependencies { + implementation(libs.ktor.client.okhttp) + } + iosMain.dependencies { + implementation(libs.ktor.client.darwin) + } + jvmMain.dependencies { + implementation(libs.ktor.client.okhttp) + } + } } \ No newline at end of file diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/KtorNetworkDataSource.kt b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/KtorNetworkDataSource.kt similarity index 100% rename from core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/KtorNetworkDataSource.kt rename to core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/KtorNetworkDataSource.kt diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/KtorRouteService.kt b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/KtorRouteService.kt similarity index 100% rename from core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/KtorRouteService.kt rename to core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/KtorRouteService.kt diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/KtorRttService.kt b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/KtorRttService.kt similarity index 100% rename from core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/KtorRttService.kt rename to core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/KtorRttService.kt diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/KtorTraceService.kt b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/KtorTraceService.kt similarity index 100% rename from core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/KtorTraceService.kt rename to core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/KtorTraceService.kt diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/di/KtorClientKoinModule.kt b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/di/KtorClientKoinModule.kt similarity index 63% rename from core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/di/KtorClientKoinModule.kt rename to core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/di/KtorClientKoinModule.kt index 1cedce9..59be837 100644 --- a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/di/KtorClientKoinModule.kt +++ b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/di/KtorClientKoinModule.kt @@ -1,10 +1,6 @@ package io.architecture.network.websocket.imp.ktor.di -import io.architecture.network.websocket.api.BASE_WS_HOST -import io.architecture.network.websocket.api.BASE_WS_PORT -import io.architecture.network.websocket.api.NODE_ROUTES_WS_PATH -import io.architecture.network.websocket.api.NODE_TRACES_WS_PATH -import io.architecture.network.websocket.api.RTT_WS_PATH +import io.architecture.core.runtime.configuration.WebsocketRuntimeConfiguration import io.architecture.network.websocket.api.model.NetworkClientTime import io.architecture.network.websocket.api.model.NetworkRoute import io.architecture.network.websocket.api.model.NetworkServerTime @@ -20,9 +16,9 @@ val ktorClientModule = module { Any::class, NetworkTrace::class, get(), - BASE_WS_HOST, - BASE_WS_PORT, - NODE_TRACES_WS_PATH + get().BASE_WS_HOST, // TODO Refactor it :) + get().BASE_WS_PORT, + get().NODE_TRACES_WS_PATH ) } @@ -31,9 +27,9 @@ val ktorClientModule = module { Any::class, NetworkRoute::class, get(), - BASE_WS_HOST, - BASE_WS_PORT, - NODE_ROUTES_WS_PATH + get().BASE_WS_HOST, + get().BASE_WS_PORT, + get().NODE_ROUTES_WS_PATH ) } @@ -42,9 +38,9 @@ val ktorClientModule = module { NetworkClientTime::class, NetworkServerTime::class, get(), - BASE_WS_HOST, - BASE_WS_PORT, - RTT_WS_PATH + get().BASE_WS_HOST, + get().BASE_WS_PORT, + get().RTT_WS_PATH ) } } \ No newline at end of file diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/di/KtorKoinModule.kt b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/di/KtorKoinModule.kt similarity index 78% rename from core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/di/KtorKoinModule.kt rename to core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/di/KtorKoinModule.kt index 4d1e950..904054e 100644 --- a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/di/KtorKoinModule.kt +++ b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/di/KtorKoinModule.kt @@ -1,7 +1,7 @@ package io.architecture.network.websocket.imp.ktor.di import io.ktor.client.HttpClient -import io.ktor.client.engine.cio.CIO +// todo import io.ktor.client.engine.cio.CIO import io.ktor.client.plugins.logging.LogLevel import io.ktor.client.plugins.logging.Logger import io.ktor.client.plugins.logging.Logging @@ -18,7 +18,10 @@ val ktorModule = module { @OptIn(ExperimentalSerializationApi::class) single { - HttpClient(CIO) { + // NOTE: If you call the HttpClient constructor without an argument, the client will choose + // an engine automatically depending on the artifacts added in a build script. + // https://ktor.io/docs/http-client-engines.html#default + HttpClient { install(WebSockets) { contentConverter = KotlinxWebsocketSerializationConverter(ProtoBuf) diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/di/KtorServiceKoinModule.kt b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/di/KtorServiceKoinModule.kt similarity index 100% rename from core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/di/KtorServiceKoinModule.kt rename to core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/di/KtorServiceKoinModule.kt diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/internal/KtorProtobufClient.kt b/core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/internal/KtorProtobufClient.kt similarity index 100% rename from core/network/websocket/imp/ktor/src/main/java/io/architecture/network/websocket/imp/ktor/internal/KtorProtobufClient.kt rename to core/network/websocket/imp/ktor/src/commonMain/kotlin/io/architecture/network/websocket/imp/ktor/internal/KtorProtobufClient.kt diff --git a/core/pool/build.gradle.kts b/core/pool/build.gradle.kts index e71ba7f..294511c 100644 --- a/core/pool/build.gradle.kts +++ b/core/pool/build.gradle.kts @@ -1,31 +1,28 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.androidLibrary) - alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) } -android { - namespace = "io.architecture.core.pool" - compileSdk = libs.versions.compileSdk.get().toInt() - - defaultConfig { - jvmTarget = libs.versions.minSdk.get().toInt() - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = libs.versions.jvmTarget.get() + sourceSets { + val commonMain by getting { + dependencies { + implementation(libs.koin.core) + } + } } -} - -dependencies { - implementation(projects.core.model) - - testImplementation(libs.junit.junit) - androidTestImplementation(libs.junit) } \ No newline at end of file diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 381db2b..8c2ca0e 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -1,26 +1,36 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.compose.ExperimentalComposeLibrary +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + plugins { - alias(libs.plugins.androidLibrary) - alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.convention.android.library) + alias(libs.plugins.jetbrainsCompose) } -android { - namespace = "io.architecture.ui" - compileSdk = libs.versions.compileSdk.get().toInt() +kotlin { + // Apply the default hierarchy again + applyDefaultHierarchyTemplate() + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + browser() + } + androidTarget() + iosX64() + iosArm64() + iosSimulatorArm64() + jvm() + sourceSets { + commonMain.dependencies { + implementation(libs.koin.core) + implementation(libs.koin.mp.compose) - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = libs.versions.jvmTarget.get() + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.ui) + @OptIn(ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + } } -} - -dependencies { - implementation(libs.androidx.coreKtx) - testImplementation(libs.junit.junit) - androidTestImplementation(libs.junit) - androidTestImplementation(libs.espresso.core) } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 353ecc4..44ec6bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,12 +17,15 @@ org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\= # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects org.gradle.parallel=true +# Enable caching between builds. +org.gradle.caching=true +# Not encouraged by Gradle and can produce weird results. Wait for isolated projects instead. +org.gradle.configureondemand=false +# Enable configuration caching between builds. +org.gradle.configuration-cache=true # This option is set because of https://github.com/google/play-services-plugins/issues/246 # to generate the Configuration Cache regardless of incompatible tasks. -# See https://github.com/android/nowinandroid/issues/1022 before using it. org.gradle.configuration-cache.problems=warn - - # Disable build features that are enabled by default, # https://developer.android.com/build/releases/gradle-plugin#default-changes android.defaults.buildfeatures.resvalues=false @@ -40,6 +43,7 @@ android.useAndroidX=true org.jetbrains.compose.experimental.wasm.enabled=true #MPP +kotlin.mpp.stability.nowarn=true kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.enableCInteropCommonization=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4eace75..2507db8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,6 +13,7 @@ androidTools = "31.2.0" geojsonVersion = "0.2.1" kotlinxSerializationJsonVersion = "1.6.3" kotlinxSerializationProtobufVersion = "1.6.3" +serializationVersion = "1.6.3" kotlinxCoroutineAndroid = "1.7.3" kotlinxCoroutineCore = "1.8.0" kotlinxDatetimeVersion = "0.5.0" @@ -51,7 +52,7 @@ animationCoreAndroidVersion = "1.6.1" foundationLayoutAndroidVersion = "1.6.1" material3AndroidVersion = "1.2.0" uiGraphicsAndroidVersion = "1.6.1" -ktorVersion = "2.3.8" +ktorVersion = "3.0.0-wasm1" gson = "2.10.1" lifecycleAndroidVersion = "0.1.12" loggingInterceptorVersion = "4.12.0" @@ -95,9 +96,8 @@ koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koinC koin-core-coroutine = { group = "io.insert-koin", name = "koin-core-coroutines", version.ref = "koinCore" } koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koinCore" } koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koinCore" } -# TODO naming + koin-mp-compose = { group = "io.insert-koin", name = "koin-compose", version.ref = "koinCore" } -koin-annotations = { group = "io.insert-koin", name = "koin-annotations", version.ref = "koinAnnotations" } koin-ksp-compiler = { group = "io.insert-koin", name = "koin-ksp-compiler", version.ref = "koinAnnotations" } koin-test = { group = "io.insert-koin", name = "koin-test", version.ref = "koinCore" } koin-android-test = { group = "io.insert-koin", name = "koin-android-test", version.ref = "koinCore" } @@ -123,13 +123,21 @@ kotlinx-coroutine-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-co kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJsonVersion" } kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinxSerializationProtobufVersion" } kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetimeVersion" } +kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serializationVersion" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorVersion" } +ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktorVersion" } +ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" } +ktor-serialization-kotlinx-protobuf = { module = "io.ktor:ktor-serialization-kotlinx-protobuf", version.ref = "ktorVersion" } +# See more https://ktor.io/docs/http-client-engines.html#limitations ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktorVersion" } -ktor-client-logging-jvm = { module = "io.ktor:ktor-client-logging-jvm", version.ref = "ktorVersion" } +ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktorVersion" } +ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktorVersion" } +ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktorVersion" } ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktorVersion" } -ktor-client-serialization-jvm = { module = "io.ktor:ktor-client-serialization-jvm", version.ref = "ktorVersion" } -ktor-serialization-kotlinx-protobuf = { module = "io.ktor:ktor-serialization-kotlinx-protobuf", version.ref = "ktorVersion" } + + + # Mapbox SDK android = { module = "com.mapbox.maps:android", version.ref = "mapBox" } diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 0e1bd02..2a53576 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -395,6 +395,13 @@ abab@^2.0.6: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== +abort-controller@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -1024,6 +1031,11 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -1862,6 +1874,13 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== +node-fetch@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + dependencies: + whatwg-url "^5.0.0" + node-forge@^1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -2560,6 +2579,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== +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -2648,6 +2672,11 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + webpack-cli@5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.0.tgz#abc4b1f44b50250f2632d8b8b536cfe2f6257891" @@ -2779,6 +2808,14 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + which@^1.2.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -2817,6 +2854,11 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== +ws@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + ws@^8.13.0: version "8.16.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" diff --git a/settings.gradle.kts b/settings.gradle.kts index e3be2d5..e87d03b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,12 +26,14 @@ dependencyResolutionManagement { authentication.create("basic") } maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + // https://youtrack.jetbrains.com/issue/KTOR-5587/Ktor-client-for-Kotlin-Wasm#focus=Comments-27-8735419.0-0 + maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental") } } + include(":ktor-server-app") include(":shared") -include(":compose-common") include(":compose-android-app") include(":compose-desktop-app") //include(":compose-ios-app") From a862f4b3085e3864ca5b386831610d6207794ede Mon Sep 17 00:00:00 2001 From: dev Date: Mon, 26 Feb 2024 12:58:27 +0200 Subject: [PATCH 12/32] Disabled wasmJs target due to bugs in ktorVersion = "3.0.0-wasm1", removed unused deps, added coreKoinModules to DI tree --- compose-android-app/build.gradle.kts | 62 ++++------ compose-web-app/build.gradle.kts | 108 +++++++++--------- core/common/build.gradle.kts | 12 +- core/data/build.gradle.kts | 8 +- core/database/api/build.gradle.kts | 8 +- core/datasource/api/build.gradle.kts | 8 +- core/designsystem/build.gradle.kts | 8 +- core/di/build.gradle.kts | 28 +++-- .../io/architecture/core/di/CoreKoinModule.kt | 0 .../core/di/CoroutineDispatcherKoinModule.kt | 3 +- .../core/di/CoroutineKoinModule.kt | 0 .../core/di/CoroutineScopeKoinModule.kt | 2 +- .../core/di/CoreKoinCheckModulesTest.kt | 54 +++++++++ .../core/di/CoreKoinCheckModulesTest.kt | 44 ------- core/domain/build.gradle.kts | 8 +- core/model/build.gradle.kts | 8 +- core/network/websocket/api/build.gradle.kts | 8 +- .../websocket/imp/ktor/build.gradle.kts | 10 +- core/pool/build.gradle.kts | 28 ----- .../core/pool/ExampleInstrumentedTest.kt | 24 ---- .../architecture/core/pool/ExampleUnitTest.kt | 17 --- core/runtime/configuration/build.gradle.kts | 8 +- core/runtime/logging/build.gradle.kts | 8 +- core/runtime/metrics/build.gradle.kts | 8 +- core/ui/build.gradle.kts | 8 +- feature/map/build.gradle.kts | 13 +-- gradle/libs.versions.toml | 10 +- settings.gradle.kts | 2 +- shared/build.gradle.kts | 26 ++--- .../kotlin/AppKoinModule.android.kt | 2 - .../androidMain/kotlin/AppWrapper.android.kt | 3 +- .../resources/compose-multiplatform.xml | 58 ++++------ .../src/iosMain/kotlin/AppKoinModule.ios.kt | 4 +- .../iosMain/kotlin/ComposeUIController.ios.kt | 1 - .../src/jvmMain/kotlin/AppKoinModule.jvm.kt | 3 +- .../wasmJsMain/kotlin/AppKoinModule.wasmJs.kt | 3 +- 36 files changed, 256 insertions(+), 349 deletions(-) rename core/di/src/{main/java => commonMain/kotlin}/io/architecture/core/di/CoreKoinModule.kt (100%) rename core/di/src/{main/java => commonMain/kotlin}/io/architecture/core/di/CoroutineDispatcherKoinModule.kt (69%) rename core/di/src/{main/java => commonMain/kotlin}/io/architecture/core/di/CoroutineKoinModule.kt (100%) rename core/di/src/{main/java => commonMain/kotlin}/io/architecture/core/di/CoroutineScopeKoinModule.kt (93%) create mode 100644 core/di/src/commonTest/kotlin/io/architecture/core/di/CoreKoinCheckModulesTest.kt delete mode 100644 core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt delete mode 100644 core/pool/build.gradle.kts delete mode 100644 core/pool/src/androidTest/java/io/architecture/core/pool/ExampleInstrumentedTest.kt delete mode 100644 core/pool/src/test/java/io/architecture/core/pool/ExampleUnitTest.kt diff --git a/compose-android-app/build.gradle.kts b/compose-android-app/build.gradle.kts index 039838a..4419813 100644 --- a/compose-android-app/build.gradle.kts +++ b/compose-android-app/build.gradle.kts @@ -4,15 +4,33 @@ import java.net.NetworkInterface plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.ksp) } kotlin { androidTarget() sourceSets { + commonMain.dependencies { + implementation(projects.shared) + // Koin + implementation(libs.koin.core.coroutine) + } val androidMain by getting { dependencies { - implementation(projects.shared) + implementation(libs.koin.android) + implementation(libs.koin.compose) + implementation(libs.kotlinx.coroutine.android) + + implementation(libs.scarlet.lifecycle.android) + implementation(libs.androidx.multidex) + implementation(libs.googleMaterialDesign) + + // Lifecycles + implementation(libs.androidx.lifecycle) + implementation(libs.androidx.lifecycleKtx) + implementation(libs.androidx.lifecycle.service) + implementation(libs.androidx.activityCompose) + implementation(libs.androidx.appCompat) + implementation(libs.androidx.coreKtx) } } } @@ -22,6 +40,10 @@ android { namespace = "io.architecture.playground" compileSdk = libs.versions.compileSdk.get().toInt() + sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") + sourceSets["main"].res.srcDirs("src/androidMain/res") + sourceSets["main"].resources.srcDirs("src/commonMain/resources") + buildFeatures { compose = true buildConfig = true @@ -37,15 +59,6 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - applicationVariants.all { - val variantName = name - sourceSets { - getByName("main") { - java.srcDir(File("build/generated/ksp/$variantName/kotlin")) - } - } - } - buildTypes { debug { buildConfigField("String", "DEV_MACHINE_IP", "\"" + getLocalIPv4[0] + "\"") @@ -72,33 +85,6 @@ android { } } -dependencies { - implementation(projects.core.domain) - - implementation(projects.feature.map) - - implementation(libs.lifecycle.android) - implementation(libs.androidx.multidex) - implementation(libs.googleMaterialDesign) - - // Lifecycles - implementation(libs.androidx.lifecycle) - implementation(libs.androidx.lifecycleKtx) - implementation(libs.androidx.lifecycle.viewmodel.ktx) - implementation(libs.androidx.lifecycle.viewModelCompose) - implementation(libs.androidx.lifecycle.runtimeCompose) - implementation(libs.androidx.lifecycle.service) - implementation(libs.androidx.activityCompose) - implementation(libs.androidx.appCompat) - implementation(libs.androidx.coreKtx) - - // Koin - implementation(libs.koin.core.coroutine) - implementation(libs.koin.android) - implementation(libs.koin.compose) - ksp(libs.koin.ksp.compiler) -} - val getLocalIPv4: List get() { val ip4s = mutableListOf() diff --git a/compose-web-app/build.gradle.kts b/compose-web-app/build.gradle.kts index 42c3d4c..d4f9455 100644 --- a/compose-web-app/build.gradle.kts +++ b/compose-web-app/build.gradle.kts @@ -1,54 +1,54 @@ -import org.jetbrains.compose.ExperimentalComposeLibrary -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl -import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig - -plugins { - alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.jetbrainsCompose) -} - -kotlin { - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - moduleName = "compose-web-app" - binaries.executable() - browser { - commonWebpackConfig { - outputFileName = "composeApp.js" - devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply { - // Uncomment and configure this if you want to open a browser different from the system default - // open = mapOf( - // "app" to mapOf( - // "name" to "google chrome" - // ) - // ) - } - } - } - - // Uncomment the next line to apply Binaryen and get optimized wasm binaries - // applyBinaryen() - } - - sourceSets { - val wasmJsTest by getting - val wasmJsMain by getting { - dependencies { - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material) - implementation(compose.ui) - @OptIn(ExperimentalComposeLibrary::class) - implementation(compose.components.resources) - implementation(projects.shared) - - // Koin - implementation(libs.koin.mp.compose) - } - } - } -} - -compose.experimental { - web.application {} -} \ No newline at end of file +//import org.jetbrains.compose.ExperimentalComposeLibrary +//import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl +//import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig +// +//plugins { +// alias(libs.plugins.kotlinMultiplatform) +// alias(libs.plugins.jetbrainsCompose) +//} +// +//kotlin { +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// moduleName = "compose-web-app" +// binaries.executable() +// browser { +// commonWebpackConfig { +// outputFileName = "composeApp.js" +// devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply { +// // Uncomment and configure this if you want to open a browser different from the system default +// // open = mapOf( +// // "app" to mapOf( +// // "name" to "google chrome" +// // ) +// // ) +// } +// } +// } +// +// // Uncomment the next line to apply Binaryen and get optimized wasm binaries +// // applyBinaryen() +// } +// +// sourceSets { +// val wasmJsTest by getting +// val wasmJsMain by getting { +// dependencies { +// implementation(compose.runtime) +// implementation(compose.foundation) +// implementation(compose.material) +// implementation(compose.ui) +// @OptIn(ExperimentalComposeLibrary::class) +// implementation(compose.components.resources) +// implementation(projects.shared) +// +// // Koin +// implementation(libs.koin.mp.compose) +// } +// } +// } +//} +// +//compose.experimental { +// web.application {} +//} \ No newline at end of file diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index b7b42a1..bd6f670 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() @@ -25,8 +25,8 @@ kotlin { implementation(projects.core.runtime.logging) } androidMain.dependencies { - // https://github.com/Kotlin/kotlinx.coroutines?tab=readme-ov-file#multiplatform - implementation(libs.kotlinx.coroutine.android) +// https://github.com/Kotlin/kotlinx.coroutines?tab=readme-ov-file#multiplatform +// implementation(libs.kotlinx.coroutine.android) } } } \ No newline at end of file diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 54b0993..ed536d7 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/database/api/build.gradle.kts b/core/database/api/build.gradle.kts index 6685cdd..bd4b48a 100644 --- a/core/database/api/build.gradle.kts +++ b/core/database/api/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/datasource/api/build.gradle.kts b/core/datasource/api/build.gradle.kts index 27294d9..cc55353 100644 --- a/core/datasource/api/build.gradle.kts +++ b/core/datasource/api/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 8c2ca0e..ec46d32 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -10,10 +10,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/di/build.gradle.kts b/core/di/build.gradle.kts index a2f5f4a..61846ef 100644 --- a/core/di/build.gradle.kts +++ b/core/di/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() @@ -20,22 +20,26 @@ kotlin { sourceSets { commonMain.dependencies { - implementation(projects.core.common) - implementation(projects.core.domain) - implementation(projects.core.data) - implementation(projects.core.network.websocket.imp.ktor) - implementation(projects.core.runtime.configuration) + api(projects.core.common) + api(projects.core.domain) + api(projects.core.data) + api(projects.core.model) + api(projects.core.network.websocket.imp.ktor) + api(projects.core.runtime.configuration) implementation(libs.kotlinx.coroutine.core) implementation(libs.koin.core) + implementation(libs.koin.test) } commonTest.dependencies { implementation(projects.core.datasource.api) + implementation(projects.core.network.websocket.api) + implementation(projects.core.database.api) + implementation(projects.core.model) + implementation(kotlin("reflect")) - implementation(libs.ktor.client.core) - implementation(libs.koin.test) - implementation(libs.junit.junit) + implementation(kotlin("test")) } } } \ No newline at end of file diff --git a/core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt b/core/di/src/commonMain/kotlin/io/architecture/core/di/CoreKoinModule.kt similarity index 100% rename from core/di/src/main/java/io/architecture/core/di/CoreKoinModule.kt rename to core/di/src/commonMain/kotlin/io/architecture/core/di/CoreKoinModule.kt diff --git a/core/di/src/main/java/io/architecture/core/di/CoroutineDispatcherKoinModule.kt b/core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineDispatcherKoinModule.kt similarity index 69% rename from core/di/src/main/java/io/architecture/core/di/CoroutineDispatcherKoinModule.kt rename to core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineDispatcherKoinModule.kt index 6079941..433ded6 100644 --- a/core/di/src/main/java/io/architecture/core/di/CoroutineDispatcherKoinModule.kt +++ b/core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineDispatcherKoinModule.kt @@ -1,10 +1,11 @@ package io.architecture.core.di import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.IO // TODO Different import that import kotlinx.coroutines.Dispatchers import org.koin.core.qualifier.named import org.koin.dsl.module -internal val coroutineDispatcherModule = module { +val coroutineDispatcherModule = module { single(named("ioDispatcher")) { Dispatchers.IO } single(named("defaultDispatcher")) { Dispatchers.Default } single(named("mainDispatcher")) { Dispatchers.Main } diff --git a/core/di/src/main/java/io/architecture/core/di/CoroutineKoinModule.kt b/core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineKoinModule.kt similarity index 100% rename from core/di/src/main/java/io/architecture/core/di/CoroutineKoinModule.kt rename to core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineKoinModule.kt diff --git a/core/di/src/main/java/io/architecture/core/di/CoroutineScopeKoinModule.kt b/core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineScopeKoinModule.kt similarity index 93% rename from core/di/src/main/java/io/architecture/core/di/CoroutineScopeKoinModule.kt rename to core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineScopeKoinModule.kt index 965ddb6..846d5d3 100644 --- a/core/di/src/main/java/io/architecture/core/di/CoroutineScopeKoinModule.kt +++ b/core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineScopeKoinModule.kt @@ -6,7 +6,7 @@ import kotlinx.coroutines.SupervisorJob import org.koin.core.qualifier.named import org.koin.dsl.module -internal val coroutineScopeModule = module { +val coroutineScopeModule = module { single(named("applicationScope")) { CoroutineScope( SupervisorJob() + get( diff --git a/core/di/src/commonTest/kotlin/io/architecture/core/di/CoreKoinCheckModulesTest.kt b/core/di/src/commonTest/kotlin/io/architecture/core/di/CoreKoinCheckModulesTest.kt new file mode 100644 index 0000000..077b0ae --- /dev/null +++ b/core/di/src/commonTest/kotlin/io/architecture/core/di/CoreKoinCheckModulesTest.kt @@ -0,0 +1,54 @@ +package io.architecture.core.di + +import io.architecture.database.api.model.NodeEntity +import io.architecture.database.api.model.RouteEntity +import io.architecture.database.api.model.TraceEntity +import io.architecture.datasource.api.LocalDataSource +import io.architecture.datasource.api.NetworkDataSource +import io.architecture.model.ConnectionEvent +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.emptyFlow +import org.koin.dsl.bind +import org.koin.dsl.module +import org.koin.test.check.checkModules +import kotlin.test.Test + +class CoreKoinCheckModulesTest { + + @Test + fun checkKoinModule() { + + val mockModules = module { + single { + object : NetworkDataSource { + override fun openSession() {} + override fun closeSession() {} + override fun streamTraces(): Flow = emptyFlow() + override fun streamRoutes(): Flow = emptyFlow() + override suspend fun sendClientTime(time: io.architecture.network.websocket.api.model.NetworkClientTime) {} + override fun streamServerTime(): Flow = emptyFlow() + override fun streamConnectionEvents(): SharedFlow = emptyFlow() as SharedFlow + } + } bind NetworkDataSource::class + single { + object : LocalDataSource { + override fun observeAllTraces(): Flow> = emptyFlow() + override fun observeAllNodes(): Flow> = emptyFlow() + override fun observeTraceCount(): Flow = emptyFlow() + override fun observeTraceBy(nodeId: String): Flow = emptyFlow() + override fun observeNodeCount(): Flow = emptyFlow() + override suspend fun getRouteBy(nodeId: String): RouteEntity? = null + override suspend fun deleteAllTraces() {} + override suspend fun createOrUpdate(trace: TraceEntity) {} + override suspend fun createOrUpdate(route: RouteEntity) {} + override suspend fun createOrUpdate(node: NodeEntity) {} + } + } bind LocalDataSource::class + } + + checkModules { + modules(coreKoinModules, mockModules) + } + } +} \ No newline at end of file diff --git a/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt b/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt deleted file mode 100644 index ef38be1..0000000 --- a/core/di/src/test/java/io/architecture/core/di/CoreKoinCheckModulesTest.kt +++ /dev/null @@ -1,44 +0,0 @@ -package io.architecture.core.di - -import io.architecture.core.runtime.configuration.runtimeModule -import io.architecture.data.repositoryModule -import io.architecture.datasource.api.LocalDataSource -import io.architecture.datasource.api.NetworkDataSource -import io.architecture.domain.di.useCaseModule -import io.architecture.network.websocket.imp.ktor.di.ktorClientModule -import io.architecture.network.websocket.imp.ktor.di.ktorModule -import io.architecture.network.websocket.imp.ktor.di.ktorServiceModule -import org.junit.Test -import org.koin.core.annotation.KoinExperimentalAPI -import org.koin.dsl.module -import org.koin.test.verify.verify - -class CoreKoinCheckModulesTest { // TODO Test fails due to kotlin-reflect. Too long (10 mins) to - // sync Gradle project after deps changes (ktor module is slow down build speed) - - private val coreModule = module { - includes( - coroutineModule, - runtimeModule, - repositoryModule, - useCaseModule, - ktorModule, - ktorClientModule, - ktorServiceModule, - ) - } - - @Test - @OptIn(KoinExperimentalAPI::class) - fun checkKoinModule() { - coreModule.verify( - extraTypes = listOf( - LocalDataSource::class, // Ignore. Provided in target module (:compose-app) - NetworkDataSource::class, // Ignore. Provided in target module (:compose-app) - kotlin.reflect.KClass::class, - io.ktor.client.engine.HttpClientEngine::class, - io.ktor.client.HttpClientConfig::class - ) - ) - } -} \ No newline at end of file diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts index eb7bc2d..eb4d2d1 100644 --- a/core/domain/build.gradle.kts +++ b/core/domain/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index cc05ef6..9e43f71 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/network/websocket/api/build.gradle.kts b/core/network/websocket/api/build.gradle.kts index 48699d1..478c91d 100644 --- a/core/network/websocket/api/build.gradle.kts +++ b/core/network/websocket/api/build.gradle.kts @@ -9,10 +9,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/network/websocket/imp/ktor/build.gradle.kts b/core/network/websocket/imp/ktor/build.gradle.kts index b3cf6a9..4154384 100644 --- a/core/network/websocket/imp/ktor/build.gradle.kts +++ b/core/network/websocket/imp/ktor/build.gradle.kts @@ -10,10 +10,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() @@ -48,7 +48,7 @@ kotlin { implementation(libs.ktor.client.okhttp) } iosMain.dependencies { - implementation(libs.ktor.client.darwin) +// implementation(libs.ktor.client.darwin) } jvmMain.dependencies { implementation(libs.ktor.client.okhttp) diff --git a/core/pool/build.gradle.kts b/core/pool/build.gradle.kts deleted file mode 100644 index 294511c..0000000 --- a/core/pool/build.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl - -plugins { - alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.convention.android.library) -} - -kotlin { - // Apply the default hierarchy again - applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } - androidTarget() - iosX64() - iosArm64() - iosSimulatorArm64() - jvm() - - sourceSets { - val commonMain by getting { - dependencies { - implementation(libs.koin.core) - } - } - } -} \ No newline at end of file diff --git a/core/pool/src/androidTest/java/io/architecture/core/pool/ExampleInstrumentedTest.kt b/core/pool/src/androidTest/java/io/architecture/core/pool/ExampleInstrumentedTest.kt deleted file mode 100644 index e396a69..0000000 --- a/core/pool/src/androidTest/java/io/architecture/core/pool/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package io.architecture.core.pool - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("io.architecture.core.pool.test", appContext.packageName) - } -} \ No newline at end of file diff --git a/core/pool/src/test/java/io/architecture/core/pool/ExampleUnitTest.kt b/core/pool/src/test/java/io/architecture/core/pool/ExampleUnitTest.kt deleted file mode 100644 index 79c6dae..0000000 --- a/core/pool/src/test/java/io/architecture/core/pool/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package io.architecture.core.pool - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/core/runtime/configuration/build.gradle.kts b/core/runtime/configuration/build.gradle.kts index 67f5d2d..0788f4d 100644 --- a/core/runtime/configuration/build.gradle.kts +++ b/core/runtime/configuration/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/runtime/logging/build.gradle.kts b/core/runtime/logging/build.gradle.kts index 9aa7921..2136418 100644 --- a/core/runtime/logging/build.gradle.kts +++ b/core/runtime/logging/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/runtime/metrics/build.gradle.kts b/core/runtime/metrics/build.gradle.kts index 294511c..d1d92f9 100644 --- a/core/runtime/metrics/build.gradle.kts +++ b/core/runtime/metrics/build.gradle.kts @@ -8,10 +8,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 8c2ca0e..ec46d32 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -10,10 +10,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() iosX64() iosArm64() diff --git a/feature/map/build.gradle.kts b/feature/map/build.gradle.kts index 9d7a975..2ab7792 100644 --- a/feature/map/build.gradle.kts +++ b/feature/map/build.gradle.kts @@ -2,8 +2,6 @@ plugins { alias(libs.plugins.androidLibrary) alias(libs.plugins.kotlin.android) - kotlin("kapt") - alias(libs.plugins.ksp) } android { @@ -35,10 +33,7 @@ android { } dependencies { - implementation(projects.core.model) - implementation(projects.core.common) // TODO - implementation(projects.core.domain) - implementation(projects.core.data) + implementation(projects.core.di) implementation(projects.core.designsystem) implementation(platform(libs.compose.bom)) @@ -46,22 +41,19 @@ dependencies { implementation(libs.androidx.animation.core.android) implementation(libs.androidx.activityCompose) implementation(libs.compose.uiToolingPreview) + implementation(libs.compose.uiToolingData) implementation(libs.compose.uiTooling) implementation(libs.accompanist.systemuicontroller) - implementation(libs.lifecycle.android) implementation(libs.androidx.coreKtx) implementation(libs.androidx.appCompat) implementation(libs.androidx.foundation.layout.android) implementation(libs.androidx.material3.android) - implementation(libs.androidx.lifecycle) - implementation(libs.androidx.lifecycleKtx) implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.lifecycle.viewModelCompose) implementation(libs.androidx.lifecycle.runtimeCompose) - implementation(libs.androidx.lifecycle.service) // Mapbox Maps SDK implementation(libs.android) @@ -73,7 +65,6 @@ dependencies { implementation(libs.koin.core) implementation(libs.koin.android) implementation(libs.koin.compose) - ksp(libs.koin.ksp.compiler) testImplementation(libs.junit.junit) androidTestImplementation(libs.junit) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2507db8..1e1ea3f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ geojsonVersion = "0.2.1" kotlinxSerializationJsonVersion = "1.6.3" kotlinxSerializationProtobufVersion = "1.6.3" serializationVersion = "1.6.3" -kotlinxCoroutineAndroid = "1.7.3" +kotlinxCoroutineAndroid = "1.8.0" kotlinxCoroutineCore = "1.8.0" kotlinxDatetimeVersion = "0.5.0" @@ -52,7 +52,8 @@ animationCoreAndroidVersion = "1.6.1" foundationLayoutAndroidVersion = "1.6.1" material3AndroidVersion = "1.2.0" uiGraphicsAndroidVersion = "1.6.1" -ktorVersion = "3.0.0-wasm1" +#ktorVersion = "3.0.0-wasm1" +ktorVersion = "2.3.8" gson = "2.10.1" lifecycleAndroidVersion = "0.1.12" loggingInterceptorVersion = "4.12.0" @@ -102,13 +103,12 @@ koin-ksp-compiler = { group = "io.insert-koin", name = "koin-ksp-compiler", vers koin-test = { group = "io.insert-koin", name = "koin-test", version.ref = "koinCore" } koin-android-test = { group = "io.insert-koin", name = "koin-android-test", version.ref = "koinCore" } - - # Jetpack Compose compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" } compose-ui = { module = "androidx.compose.ui:ui" } compose-uiTooling = { module = "androidx.compose.ui:ui-tooling" } compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview" } +compose-uiToolingData = { module = "androidx.compose.ui:ui-tooling-data" } androidx-animation-core-android = { group = "androidx.compose.animation", name = "animation-core-android", version.ref = "animationCoreAndroidVersion" } androidx-foundation-layout-android = { group = "androidx.compose.foundation", name = "foundation-layout-android", version.ref = "foundationLayoutAndroidVersion" } androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3AndroidVersion" } @@ -145,7 +145,7 @@ maps-compose = { module = "com.mapbox.extension:maps-compose", version.ref = "ma maps-style = { module = "com.mapbox.extension:maps-style", version.ref = "mapsStyleVersion" } # Tinder scarlet & OkHTTP -lifecycle-android = { module = "com.tinder.scarlet:lifecycle-android", version.ref = "lifecycleAndroidVersion" } +scarlet-lifecycle-android = { module = "com.tinder.scarlet:lifecycle-android", version.ref = "lifecycleAndroidVersion" } message-adapter-gson = { module = "com.tinder.scarlet:message-adapter-gson", version.ref = "sarletMessageAdapterVersion" } message-adapter-protobuf = { module = "com.tinder.scarlet:message-adapter-protobuf", version.ref = "sarletMessageAdapterVersion" } scarlet = { module = "com.tinder.scarlet:scarlet", version.ref = "scarletVersion" } diff --git a/settings.gradle.kts b/settings.gradle.kts index e87d03b..0bcff67 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,7 @@ dependencyResolutionManagement { } maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") // https://youtrack.jetbrains.com/issue/KTOR-5587/Ktor-client-for-Kotlin-Wasm#focus=Comments-27-8735419.0-0 - maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental") +// maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental") } } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index a9179fd..425f74d 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -10,10 +10,10 @@ plugins { kotlin { // Apply the default hierarchy again applyDefaultHierarchyTemplate() - @OptIn(ExperimentalWasmDsl::class) - wasmJs { - browser() - } +// @OptIn(ExperimentalWasmDsl::class) +// wasmJs { +// browser() +// } androidTarget() @@ -33,16 +33,16 @@ kotlin { sourceSets { val androidMain by getting { dependencies { - implementation(projects.core.di) implementation(projects.core.database.imp.room) - implementation(projects.feature.map) + api(projects.feature.map) } } val commonMain by getting { dependencies { + api(projects.core.di) + implementation(libs.koin.core) - implementation(libs.koin.test) implementation(libs.koin.mp.compose) implementation(compose.runtime) @@ -51,8 +51,6 @@ kotlin { implementation(compose.ui) @OptIn(ExperimentalComposeLibrary::class) implementation(compose.components.resources) - - implementation(projects.core.runtime.configuration) } } val iosMain by getting { @@ -61,14 +59,14 @@ kotlin { } } val jvmMain by getting { - dependencies { - implementation(projects.core.di) - } - } - val wasmJsMain by getting { dependencies { } } +// val wasmJsMain by getting { +// dependencies { +// +// } +// } } } diff --git a/shared/src/androidMain/kotlin/AppKoinModule.android.kt b/shared/src/androidMain/kotlin/AppKoinModule.android.kt index 6fe6aa5..2816a3c 100644 --- a/shared/src/androidMain/kotlin/AppKoinModule.android.kt +++ b/shared/src/androidMain/kotlin/AppKoinModule.android.kt @@ -1,5 +1,4 @@ import io.architecture.core.di.coreKoinModules -import io.architecture.core.runtime.configuration.runtimeModule import io.architecture.database.imp.room.di.roomDaoModule import io.architecture.database.imp.room.di.roomDatabaseModule import io.architecture.map.featureMapModule @@ -8,7 +7,6 @@ import org.koin.dsl.module actual val appModule = module { includes( coreKoinModules, - runtimeModule, roomDaoModule, roomDatabaseModule, featureMapModule diff --git a/shared/src/androidMain/kotlin/AppWrapper.android.kt b/shared/src/androidMain/kotlin/AppWrapper.android.kt index 5b5e324..57660c6 100644 --- a/shared/src/androidMain/kotlin/AppWrapper.android.kt +++ b/shared/src/androidMain/kotlin/AppWrapper.android.kt @@ -1,3 +1,4 @@ import androidx.compose.runtime.Composable -@Composable fun AppWrapper() = AppContainer() \ No newline at end of file +@Composable +fun AppWrapper() = AppContainer() \ No newline at end of file diff --git a/shared/src/commonMain/resources/compose-multiplatform.xml b/shared/src/commonMain/resources/compose-multiplatform.xml index d7bf795..8fb6d29 100644 --- a/shared/src/commonMain/resources/compose-multiplatform.xml +++ b/shared/src/commonMain/resources/compose-multiplatform.xml @@ -1,36 +1,24 @@ - - - - - - - + + + + + + + diff --git a/shared/src/iosMain/kotlin/AppKoinModule.ios.kt b/shared/src/iosMain/kotlin/AppKoinModule.ios.kt index 1914d29..e900afe 100644 --- a/shared/src/iosMain/kotlin/AppKoinModule.ios.kt +++ b/shared/src/iosMain/kotlin/AppKoinModule.ios.kt @@ -1,7 +1,7 @@ -import io.architecture.core.runtime.configuration.runtimeModule +import io.architecture.core.di.coreKoinModules import org.koin.core.module.Module import org.koin.dsl.module actual val appModule: Module = module { - includes(runtimeModule) + includes(coreKoinModules) } \ No newline at end of file diff --git a/shared/src/iosMain/kotlin/ComposeUIController.ios.kt b/shared/src/iosMain/kotlin/ComposeUIController.ios.kt index 1158411..b8e5170 100644 --- a/shared/src/iosMain/kotlin/ComposeUIController.ios.kt +++ b/shared/src/iosMain/kotlin/ComposeUIController.ios.kt @@ -1,6 +1,5 @@ import androidx.compose.ui.window.ComposeUIViewController import org.koin.compose.KoinApplication -import org.koin.core.KoinApplication fun controller() = ComposeUIViewController { KoinApplication(application = { diff --git a/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt b/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt index 0b51dc3..e900afe 100644 --- a/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt +++ b/shared/src/jvmMain/kotlin/AppKoinModule.jvm.kt @@ -1,8 +1,7 @@ import io.architecture.core.di.coreKoinModules -import io.architecture.core.runtime.configuration.runtimeModule import org.koin.core.module.Module import org.koin.dsl.module actual val appModule: Module = module { - includes(coreKoinModules, runtimeModule) + includes(coreKoinModules) } \ No newline at end of file diff --git a/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt b/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt index 61b0ec8..c53e739 100644 --- a/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt +++ b/shared/src/wasmJsMain/kotlin/AppKoinModule.wasmJs.kt @@ -1,10 +1,11 @@ +import io.architecture.core.di.coreKoinModules import io.architecture.core.runtime.configuration.runtimeModule import org.koin.core.module.Module import org.koin.dsl.module actual val appModule: Module = module { includes( -// coreKoinModules, will be soon here + coreKoinModules, runtimeModule, ) } \ No newline at end of file From 34f344cfe73764a4d4622df548ca31828f39f56d Mon Sep 17 00:00:00 2001 From: dev Date: Mon, 26 Feb 2024 13:14:51 +0200 Subject: [PATCH 13/32] Renamed module: :core:compose-web-app -> :core:compose-web-wasm-app --- {compose-web-app => compose-web-wasm-app}/build.gradle.kts | 0 .../src/wasmJsMain/kotlin/main.kt | 0 .../src/wasmJsMain/resources/index.html | 0 settings.gradle.kts | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename {compose-web-app => compose-web-wasm-app}/build.gradle.kts (100%) rename {compose-web-app => compose-web-wasm-app}/src/wasmJsMain/kotlin/main.kt (100%) rename {compose-web-app => compose-web-wasm-app}/src/wasmJsMain/resources/index.html (100%) diff --git a/compose-web-app/build.gradle.kts b/compose-web-wasm-app/build.gradle.kts similarity index 100% rename from compose-web-app/build.gradle.kts rename to compose-web-wasm-app/build.gradle.kts diff --git a/compose-web-app/src/wasmJsMain/kotlin/main.kt b/compose-web-wasm-app/src/wasmJsMain/kotlin/main.kt similarity index 100% rename from compose-web-app/src/wasmJsMain/kotlin/main.kt rename to compose-web-wasm-app/src/wasmJsMain/kotlin/main.kt diff --git a/compose-web-app/src/wasmJsMain/resources/index.html b/compose-web-wasm-app/src/wasmJsMain/resources/index.html similarity index 100% rename from compose-web-app/src/wasmJsMain/resources/index.html rename to compose-web-wasm-app/src/wasmJsMain/resources/index.html diff --git a/settings.gradle.kts b/settings.gradle.kts index 0bcff67..0bd4b84 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -37,7 +37,7 @@ include(":shared") include(":compose-android-app") include(":compose-desktop-app") //include(":compose-ios-app") -include(":compose-web-app") +include(":compose-web-wasm-app") include(":core:common") include(":core:model") From b799bfc7c025d19813f7311f988a5fe4cd64a4e4 Mon Sep 17 00:00:00 2001 From: dev Date: Mon, 26 Feb 2024 19:43:48 +0200 Subject: [PATCH 14/32] Migration of composable funs: Jetpack Compose -> Compose Multiplatform --- .../io/architecture/playground/MapActivity.kt | 4 +- core/ui/build.gradle.kts | 3 ++ .../io/architecture/ui/NodeDetailsContent.kt | 27 ++++++------- .../kotlin/io/architecture/ui}/StatusBar.kt | 10 ++--- feature/map/build.gradle.kts | 1 + .../java/io/architecture/map/MapScreen.kt | 4 +- shared/build.gradle.kts | 1 + shared/src/commonMain/kotlin/App.kt | 40 ++++++------------- 8 files changed, 39 insertions(+), 51 deletions(-) rename feature/map/src/main/java/io/architecture/map/BottomSheet.kt => core/ui/src/commonMain/kotlin/io/architecture/ui/NodeDetailsContent.kt (76%) rename {feature/map/src/main/java/io/architecture/map => core/ui/src/commonMain/kotlin/io/architecture/ui}/StatusBar.kt (91%) diff --git a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt index 395a5ca..9a1fb22 100644 --- a/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt +++ b/compose-android-app/src/androidMain/kotlin/io/architecture/playground/MapActivity.kt @@ -16,8 +16,8 @@ class MapActivity : ComponentActivity() { setContent { KoinContext { - MapScreen() -// AppWrapper() +// MapScreen() + AppWrapper() } } diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index ec46d32..097aa8f 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -22,6 +22,9 @@ kotlin { sourceSets { commonMain.dependencies { + implementation(projects.core.designsystem) + implementation(projects.core.model) + implementation(libs.koin.core) implementation(libs.koin.mp.compose) diff --git a/feature/map/src/main/java/io/architecture/map/BottomSheet.kt b/core/ui/src/commonMain/kotlin/io/architecture/ui/NodeDetailsContent.kt similarity index 76% rename from feature/map/src/main/java/io/architecture/map/BottomSheet.kt rename to core/ui/src/commonMain/kotlin/io/architecture/ui/NodeDetailsContent.kt index 99eaf04..056ee7d 100644 --- a/feature/map/src/main/java/io/architecture/map/BottomSheet.kt +++ b/core/ui/src/commonMain/kotlin/io/architecture/ui/NodeDetailsContent.kt @@ -1,8 +1,8 @@ -package io.architecture.map +package io.architecture.ui import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Text +import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.SpanStyle @@ -11,12 +11,13 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import io.architecture.model.Trace @Composable -fun NodeBottomSheetContent( - state: DetailsUiState, - selectedNode: String +fun NodeDetailsContent( + trace: Trace?, + selectedNode: String, ) { Column( modifier = Modifier.padding(16.dp) @@ -24,42 +25,38 @@ fun NodeBottomSheetContent( listOf( // TODO With map please :) buildAnnotatedString { append( - String.format( - "%s: %f° (reference plane is true north)", - state.lastTrace?.direction, - state.lastTrace?.azimuth, - ) + "${trace?.direction}: ${trace?.azimuth} (reference plane is true north)" ) }, buildAnnotatedString { withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) { append("Attitude: ") } - append(state.lastTrace?.alt.toString()) + append(trace?.alt.toString()) }, buildAnnotatedString { withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) { append("Speed: ") } - append("${state.lastTrace?.speed} m/s") + append("${trace?.speed} m/s") }, buildAnnotatedString { withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) { append("Longitude: ") } - append(state.lastTrace?.lon.toString()) + append(trace?.lon.toString()) }, buildAnnotatedString { withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) { append("Latitude: ") } - append(state.lastTrace?.lat.toString()) + append(trace?.lat.toString()) }, buildAnnotatedString { withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) { append("Sent at: ") } - append(state.lastTrace?.formattedDatetime) + append(trace?.formattedDatetime) }, buildAnnotatedString { withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) { diff --git a/feature/map/src/main/java/io/architecture/map/StatusBar.kt b/core/ui/src/commonMain/kotlin/io/architecture/ui/StatusBar.kt similarity index 91% rename from feature/map/src/main/java/io/architecture/map/StatusBar.kt rename to core/ui/src/commonMain/kotlin/io/architecture/ui/StatusBar.kt index 3c46d0e..39df97e 100644 --- a/feature/map/src/main/java/io/architecture/map/StatusBar.kt +++ b/core/ui/src/commonMain/kotlin/io/architecture/ui/StatusBar.kt @@ -1,4 +1,4 @@ -package io.architecture.map +package io.architecture.ui import androidx.compose.animation.animateColor import androidx.compose.animation.core.LinearEasing @@ -8,7 +8,7 @@ import androidx.compose.animation.core.rememberInfiniteTransition import androidx.compose.animation.core.tween import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row -import androidx.compose.material3.Text +import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment @@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import com.google.accompanist.systemuicontroller.rememberSystemUiController +// TODO import com.google.accompanist.systemuicontroller.rememberSystemUiController import io.architecture.core.design.system.theme.black import io.architecture.core.design.system.theme.teal_700 import io.architecture.core.design.system.theme.teal_700_dark @@ -26,7 +26,7 @@ import io.architecture.model.Connection @Composable fun StatusBar(modifier: Modifier, connection: Connection, nodesCount: Int) { - val systemUiController = rememberSystemUiController() +// TODO val systemUiController = rememberSystemUiController() val infiniteTransition = rememberInfiniteTransition(label = "infinite") val color by infiniteTransition.animateColor( @@ -53,7 +53,7 @@ fun StatusBar(modifier: Modifier, connection: Connection, nodesCount: Int) { val colorOnState = if (connection.state != Connection.State.OPENED) bgColor else color - systemUiController.setStatusBarColor(colorOnState) +// TODO systemUiController.setStatusBarColor(colorOnState) Row( modifier = modifier .drawBehind { diff --git a/feature/map/build.gradle.kts b/feature/map/build.gradle.kts index 2ab7792..0a1bb09 100644 --- a/feature/map/build.gradle.kts +++ b/feature/map/build.gradle.kts @@ -35,6 +35,7 @@ android { dependencies { implementation(projects.core.di) implementation(projects.core.designsystem) + implementation(projects.core.ui) implementation(platform(libs.compose.bom)) implementation(libs.compose.ui) diff --git a/feature/map/src/main/java/io/architecture/map/MapScreen.kt b/feature/map/src/main/java/io/architecture/map/MapScreen.kt index c7a148e..be35b64 100644 --- a/feature/map/src/main/java/io/architecture/map/MapScreen.kt +++ b/feature/map/src/main/java/io/architecture/map/MapScreen.kt @@ -78,7 +78,7 @@ fun MapScreen(viewModel: MapViewModel = koinViewModel()) { ) { } - StatusBar( + io.architecture.ui.StatusBar( modifier = Modifier .fillMaxWidth() .height(20.dp), @@ -95,7 +95,7 @@ fun MapScreen(viewModel: MapViewModel = koinViewModel()) { }, sheetState = sheetState ) { - NodeBottomSheetContent(details, selectedNodeId) + io.architecture.ui.NodeDetailsContent(details.lastTrace, selectedNodeId) } } } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 425f74d..5a08fb1 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -41,6 +41,7 @@ kotlin { val commonMain by getting { dependencies { api(projects.core.di) + implementation(projects.core.ui) // TODO for tests implementation(libs.koin.core) implementation(libs.koin.mp.compose) diff --git a/shared/src/commonMain/kotlin/App.kt b/shared/src/commonMain/kotlin/App.kt index da2768d..bb74f39 100644 --- a/shared/src/commonMain/kotlin/App.kt +++ b/shared/src/commonMain/kotlin/App.kt @@ -1,40 +1,26 @@ -import androidx.compose.animation.AnimatedVisibility -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material.Button +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp import io.architecture.core.runtime.configuration.Runtime -import org.jetbrains.compose.resources.ExperimentalResourceApi +import io.architecture.model.Connection +import io.architecture.model.UpstreamRtt +import io.architecture.ui.StatusBar import org.koin.compose.koinInject -@OptIn(ExperimentalResourceApi::class) @Composable fun AppContainer() { MaterialTheme { - var showContent by remember { mutableStateOf(false) } - val runtime = koinInject() - Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { - Button(onClick = { showContent = !showContent }) { - Text("Click me!") - } - AnimatedVisibility(showContent) { - Column( - Modifier.fillMaxWidth(), - horizontalAlignment = Alignment.CenterHorizontally - ) { - // Web app stuck on it -// Image(painterResource(DrawableResource("compose-multiplatform.xml")), null) - Text("Compose: ${runtime.platform.name},\nRuntime configuration: ${runtime.websocketConfiguration}") - } - } - } + StatusBar( + modifier = Modifier + .wrapContentSize() + .fillMaxWidth(), + Connection(Connection.State.FAILED, rtt = UpstreamRtt(0)), + 0 + ) } } \ No newline at end of file From 6340d56b2d35aa741b49af77ba4582d33de407d0 Mon Sep 17 00:00:00 2001 From: dev Date: Mon, 26 Feb 2024 23:06:53 +0200 Subject: [PATCH 15/32] Added :compose-web-app (js) target. Coroutine DI module per target, due to IO dispatcher is not available for jsMain --- .run/Web app (JS).run.xml | 24 ++++ ...b app.run.xml => Web app (WasmJS).run.xml} | 2 +- compose-web-app/build.gradle.kts | 31 ++++++ .../io/architecture/compose/web/app/App.kt | 31 ++++++ .../io/architecture/compose/web/app/Styles.kt | 74 ++++++++++++ .../src/jsMain/resources/index.html | 12 ++ core/common/build.gradle.kts | 17 ++- core/data/build.gradle.kts | 5 +- core/database/api/build.gradle.kts | 5 +- core/datasource/api/build.gradle.kts | 5 +- core/designsystem/build.gradle.kts | 4 +- core/di/build.gradle.kts | 5 +- .../core/di/CoroutineDispatcherKoinModule.kt | 3 +- .../CoroutineDispatcherKoinModuleExpected.kt | 5 + .../core/di/CoroutineDispatcherKoinModule.kt | 12 ++ .../core/di/CoroutineDispatcherKoinModule.kt | 11 ++ .../core/di/CoroutineDispatcherKoinModule.kt | 11 ++ core/domain/build.gradle.kts | 5 +- core/model/build.gradle.kts | 5 +- core/network/websocket/api/build.gradle.kts | 5 +- .../websocket/imp/ktor/build.gradle.kts | 11 +- core/runtime/configuration/build.gradle.kts | 5 +- .../runtime/configuration/Platform.jvm.kt | 5 + core/runtime/logging/build.gradle.kts | 5 +- core/runtime/metrics/build.gradle.kts | 5 +- core/ui/build.gradle.kts | 4 +- gradle.properties | 1 + kotlin-js-store/yarn.lock | 105 +++++++++++++++++- settings.gradle.kts | 1 + shared/build.gradle.kts | 15 +-- .../kotlin/{App.kt => AppComposable.kt} | 22 ++-- .../resources/compose-multiplatform.xml | 24 ---- shared/src/jsMain/kotlin/AppKoinModule.jvm.kt | 7 ++ 33 files changed, 398 insertions(+), 84 deletions(-) create mode 100644 .run/Web app (JS).run.xml rename .run/{Web app.run.xml => Web app (WasmJS).run.xml} (89%) create mode 100644 compose-web-app/build.gradle.kts create mode 100644 compose-web-app/src/jsMain/kotlin/io/architecture/compose/web/app/App.kt create mode 100644 compose-web-app/src/jsMain/kotlin/io/architecture/compose/web/app/Styles.kt create mode 100644 compose-web-app/src/jsMain/resources/index.html rename core/di/src/{commonMain => androidMain}/kotlin/io/architecture/core/di/CoroutineDispatcherKoinModule.kt (69%) create mode 100644 core/di/src/commonMain/kotlin/io/architecture/core/di/CoroutineDispatcherKoinModuleExpected.kt create mode 100644 core/di/src/iosMain/kotlin/io/architecture/core/di/CoroutineDispatcherKoinModule.kt create mode 100644 core/di/src/jsMain/kotlin/io/architecture/core/di/CoroutineDispatcherKoinModule.kt create mode 100644 core/di/src/jvmMain/kotlin/io/architecture/core/di/CoroutineDispatcherKoinModule.kt create mode 100644 core/runtime/configuration/src/jsMain/kotlin/io/architecture/core/runtime/configuration/Platform.jvm.kt rename shared/src/commonMain/kotlin/{App.kt => AppComposable.kt} (50%) delete mode 100644 shared/src/commonMain/resources/compose-multiplatform.xml create mode 100644 shared/src/jsMain/kotlin/AppKoinModule.jvm.kt diff --git a/.run/Web app (JS).run.xml b/.run/Web app (JS).run.xml new file mode 100644 index 0000000..8c304d5 --- /dev/null +++ b/.run/Web app (JS).run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/.run/Web app.run.xml b/.run/Web app (WasmJS).run.xml similarity index 89% rename from .run/Web app.run.xml rename to .run/Web app (WasmJS).run.xml index 52f200c..7c7e200 100644 --- a/.run/Web app.run.xml +++ b/.run/Web app (WasmJS).run.xml @@ -1,5 +1,5 @@ - +