From 5ecb0eb10f862f8c6c794e135b009c0c32eeb790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BCrk?= Date: Wed, 11 Dec 2024 10:50:10 +0100 Subject: [PATCH] [TASK] Prepare for package renaming in next major version Repository is already renamed, and with the next major version 5.x the composer package name and extension key are renamed. This change prepares toward this renaming by adding corresponding conflict to `composer.json` and `ext_emconf.php`. Additionally, basic version branch preparation is done. Used command(s): ```shell git checkout main && git fetch --all && git pull --rebase && git checkout -b 4 cat composer.json | jq '.conflict."webvision/deepltranslate-core"="*"' --indent 4 | sponge composer.json composer config --unset extra.branch-alias.dev-main composer config extra.branch-alias.dev-4 "4.x.x-dev" ``` --- composer.json | 5 +++-- ext_emconf.php | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9f173e00..8763782a 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,8 @@ "source": "https://github.com/web-vision/wv_deepltranslate" }, "conflict": { - "studiomitte/recordlist-thumbnail": "*" + "studiomitte/recordlist-thumbnail": "*", + "webvision/deepltranslate-core": "*" }, "config": { "vendor-dir": ".Build/vendor", @@ -62,7 +63,7 @@ "app-dir": ".Build" }, "branch-alias": { - "dev-main": "4.x.x-dev" + "dev-4": "4.x.x-dev" } }, "require": { diff --git a/ext_emconf.php b/ext_emconf.php index a7ce4349..fb5a971e 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -26,6 +26,7 @@ ], 'conflicts' => [ 'recordlist_thumbnail' => '*', + 'deepltranslate_core' => '*', ], 'suggests' => [], ],