diff --git a/.github/ISSUE_TEMPLATE/update-module.md b/.github/ISSUE_TEMPLATE/update-module-classic.md similarity index 64% rename from .github/ISSUE_TEMPLATE/update-module.md rename to .github/ISSUE_TEMPLATE/update-module-classic.md index 2a77a7a3..2a72f5c4 100644 --- a/.github/ISSUE_TEMPLATE/update-module.md +++ b/.github/ISSUE_TEMPLATE/update-module-classic.md @@ -1,6 +1,6 @@ --- -name: Update module -about: Refresh an existing contrib module to a newer version. +name: Update classic module +about: Refresh an existing contrib module to a newer version where version names still use prefixes based on Drupal core. title: Update "NAME" module from CURRENT to NEWER labels: update assignees: '' diff --git a/.github/ISSUE_TEMPLATE/update-module-modern.md b/.github/ISSUE_TEMPLATE/update-module-modern.md new file mode 100644 index 00000000..0b0afc0c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/update-module-modern.md @@ -0,0 +1,10 @@ +--- +name: Update modern module +about: Refresh an existing contrib module to a newer version where a prefix based on Drupal core is absent in version names. +title: Update "NAME" module from CURRENT to NEWER +labels: update +assignees: '' + +--- + +Update [NAME](https://www.drupal.org/project/KEY) module from **CURRENT** to **NEWER**. Compare versions [here](https://git.drupalcode.org/project/KEY/-/compare/CURRENT...NEWER). diff --git a/composer.json b/composer.json index 9aa977d2..0854cb95 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "drupal/symfony_mailer": "1.3.2" }, "require-dev": { - "drupal/config2php": "3.0.0", + "drupal/config2php": "3.0.2", "twbs/bootstrap-sass": "3.4.3" }, "extra": { diff --git a/d8.info.yml b/d8.info.yml index 5352ed43..5275a0f9 100644 --- a/d8.info.yml +++ b/d8.info.yml @@ -3,7 +3,7 @@ description: The installation profile for CMS Drupal 10 based on the most common type: profile core_version_requirement: ^10.2 -version: 0.19.1.170 +version: 0.19.2.171 distribution: name: D8+ diff --git a/d8.install b/d8.install index a63f2ed7..622a6d64 100644 --- a/d8.install +++ b/d8.install @@ -52,6 +52,16 @@ function d8_update_10202(array &$sandbox): void { \Drupal::classResolver(D8Setup::class)->module('d8_link'); } +/** + * Uninstall deprecated modules. + */ +function d8_update_10203(array &$sandbox): void { + foreach (['blocks_d8_theme', 'blocks_seven', 'menus', 'settings'] as $name) { + \Drupal::classResolver(D8Setup::class) + ->module('d8_feature_' . $name, uninstall: TRUE); + } +} + /** * Process list of update hooks. * diff --git a/modules/features/d8_config2php/d8_config2php.info.yml b/modules/features/d8_config2php/d8_config2php.info.yml index 5a5ec785..5cdce742 100644 --- a/modules/features/d8_config2php/d8_config2php.info.yml +++ b/modules/features/d8_config2php/d8_config2php.info.yml @@ -3,7 +3,7 @@ description: Provides a wrapper for the Config Export to PHP array module. package: D8+ type: module -core_version_requirement: ^10 +core_version_requirement: ^10 || ^11 dependencies: - config2php:config2php