From abb1c41dab61f8a4698c6c71d44501f648cf5ae8 Mon Sep 17 00:00:00 2001 From: Doeke Norg Date: Mon, 26 Aug 2024 12:20:33 +0200 Subject: [PATCH] Remove need for inner composer.json --- composer.json | 2 +- src/Addon/GravityExportAddon.php | 4 ++-- src/composer.json | 10 ---------- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 src/composer.json diff --git a/composer.json b/composer.json index b050e87a..94a2950b 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,7 @@ "@unbuild", "cp composer.json build/composer.json", "mkdir build/src && cp src/GFExcelAdmin.php build/src/", - "composer config repositories.source '{\"type\":\"path\", \"url\":\"../src\",\"options\": {\"symlink\":false}}' --working-dir=build", + "composer config repositories.source '{\"type\":\"package\", \"package\": { \"name\": \"gravitykit/gravityexport-lite-src\", \"version\": \"dev-main\", \"dist\": { \"type\": \"path\", \"url\":\"../src\", \"options\": {\"symlink\":false}}}}' --working-dir=build", "composer require gravitykit/gravityexport-lite-src:@dev --update-no-dev --working-dir=build --no-scripts", "cd build && ./strauss.phar", "composer dump-autoload -o --working-dir=build" diff --git a/src/Addon/GravityExportAddon.php b/src/Addon/GravityExportAddon.php index ada41991..93b26a08 100644 --- a/src/Addon/GravityExportAddon.php +++ b/src/Addon/GravityExportAddon.php @@ -125,8 +125,8 @@ public function minimum_requirements(): array { 'dom', 'zlib', 'xml', - 'iconv', - 'mbstring', + 'iconv', + 'mbstring', ], ] ]; diff --git a/src/composer.json b/src/composer.json deleted file mode 100644 index ac414663..00000000 --- a/src/composer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "gravitykit/gravityexport-lite-src", - "description": "Internal package for build purposes", - "type": "library", - "autoload": { - "psr-4": { - "GFExcel\\": "./" - } - } -}