Skip to content

Commit

Permalink
[TASK] Prepare for package renaming in next major version
Browse files Browse the repository at this point in the history
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"
```
  • Loading branch information
sbuerk committed Dec 11, 2024
1 parent c5cc4a4 commit 5ecb0eb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -62,7 +63,7 @@
"app-dir": ".Build"
},
"branch-alias": {
"dev-main": "4.x.x-dev"
"dev-4": "4.x.x-dev"
}
},
"require": {
Expand Down
1 change: 1 addition & 0 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
],
'conflicts' => [
'recordlist_thumbnail' => '*',
'deepltranslate_core' => '*',
],
'suggests' => [],
],
Expand Down

0 comments on commit 5ecb0eb

Please sign in to comment.