BcColumnの依存関係について調整

seto1 · Jun 27, 2024 · 6355d26 · 6355d26
1 parent 42c5bec
commit 6355d26
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -51,13 +51,11 @@
             "BcInstaller\\": "plugins/bc-installer/src/",
             "BcMail\\": "plugins/bc-mail/src/",
             "BcSearchIndex\\": "plugins/bc-search-index/src/",
-            "BcSpaSample\\": "plugins/BcSpaSample/src/",
             "BcThemeConfig\\": "plugins/bc-theme-config/src/",
             "BcThemeFile\\": "plugins/bc-theme-file/src/",
             "BcUploader\\": "plugins/bc-uploader/src/",
             "BcWidgetArea\\": "plugins/bc-widget-area/src/",
-            "Cake\\Routing\\": "plugins/baser-core/src/Routing",
-            "SoftDelete\\": "plugins/cakephp-soft-delete/src"
+            "Cake\\Routing\\": "plugins/baser-core/src/Routing"
         }
     },
     "autoload-dev": {
@@ -74,15 +72,13 @@
             "BcThemeConfig\\Test\\": "plugins/bc-theme-config/tests/",
             "BcThemeFile\\Test\\": "plugins/bc-theme-file/tests/",
             "BcUploader\\Test\\": "plugins/bc-uploader/tests/",
-            "BcWidgetArea\\Test\\": "plugins/bc-widget-area/tests/",
-            "SoftDelete\\Test\\": "plugins/cakephp-soft-delete/tests"
+            "BcWidgetArea\\Test\\": "plugins/bc-widget-area/tests/"
         }
     },
     "replace": {
         "baserproject/baser-core": "5.0.19",
         "baserproject/bc-admin-third": "5.0.19",
         "baserproject/bc-blog": "5.0.19",
-        "baserproject/bc-column": "5.0.19",
         "baserproject/bc-content-link": "5.0.19",
         "baserproject/bc-custom-content": "5.0.19",
         "baserproject/bc-editor-template": "5.0.19",

diff --git a/monorepo-builder.php b/monorepo-builder.php
@@ -9,11 +9,12 @@
 
 return static function (MBConfig $mbConfig): void {
     $mbConfig->packageDirectories([__DIR__ . '/plugins']);
-    $version = ($_SERVER['argv'][2])?: '';
+    $version = (!empty($_SERVER['argv'][2]))? $_SERVER['argv'][2] : '';
     if(!$version) return;
     $mbConfig->packageDirectoriesExcludes([
         __DIR__ . '/plugins/BcThemeSample',
         __DIR__ . '/plugins/BcPluginSample',
+        __DIR__ . '/plugins/BcColumn',
     ]);
     // for "merge" command
     $mbConfig->dataToAppend([

diff --git a/plugins/BcColumn/composer.json b/plugins/BcColumn/composer.json
diff --git a/plugins/baser-core/composer.json b/plugins/baser-core/composer.json
@@ -16,20 +16,20 @@
         "josegonzalez/dotenv": "^3.2",
         "mobiledetect/mobiledetectlib": "^4.8.03",
         "ext-json": "*",
-        "baserproject/bc-admin-third": "5.1.x",
-        "baserproject/bc-blog": "5.1.x",
-        "baserproject/bc-content-link": "5.1.x",
-        "baserproject/bc-custom-content": "5.1.x",
-        "baserproject/bc-editor-template": "5.1.x",
-        "baserproject/bc-favorite": "5.1.x",
-        "baserproject/bc-front": "5.1.x",
-        "baserproject/bc-installer": "5.1.x",
-        "baserproject/bc-mail": "5.1.x",
-        "baserproject/bc-search-index": "5.1.x",
-        "baserproject/bc-theme-config": "5.1.x",
-        "baserproject/bc-theme-file": "5.1.x",
-        "baserproject/bc-uploader": "5.1.x",
-        "baserproject/bc-widget-area": "5.1.x",
+        "baserproject/bc-admin-third": "5.1.*",
+        "baserproject/bc-blog": "5.1.*",
+        "baserproject/bc-content-link": "5.1.*",
+        "baserproject/bc-custom-content": "5.1.*",
+        "baserproject/bc-editor-template": "5.1.*",
+        "baserproject/bc-favorite": "5.1.*",
+        "baserproject/bc-front": "5.1.*",
+        "baserproject/bc-installer": "5.1.*",
+        "baserproject/bc-mail": "5.1.*",
+        "baserproject/bc-search-index": "5.1.*",
+        "baserproject/bc-theme-config": "5.1.*",
+        "baserproject/bc-theme-file": "5.1.*",
+        "baserproject/bc-uploader": "5.1.*",
+        "baserproject/bc-widget-area": "5.1.*",
         "ext-mbstring": "*",
         "ext-zip": "*",
         "ext-gd": "*"
@@ -40,7 +40,7 @@
         "cakephp/debug_kit": "^5.0.0",
         "josegonzalez/dotenv": "^4.0",
         "phpunit/phpunit": "^10.1.0",
-        "symplify/monorepo-builder": "^10.2",
+        "symplify/monorepo-builder": "^11.2",
         "vierge-noire/cakephp-fixture-factories": "^3.0",
         "vierge-noire/cakephp-test-suite-light": "^3.0",
         "ext-xdebug": "*"