diff --git a/composer.json b/composer.json index 26989af68..1b025b02f 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "drupal/config_filter": "2.6.0", "drupal/config_ignore": "3.2.0", "drupal/config_perms": "2.1", - "drupal/config_split": "2.0.0", + "drupal/config_split": "2.0.1", "drupal/config_update": "2.0.0-alpha3", "drupal/consultation-consultation": "1.0.4", "drupal/consumers": "1.17.0", @@ -43,7 +43,7 @@ "drupal/devel": "5.1.2", "drupal/diff": "1.1.0", "drupal/dropzonejs": "2.10.0", - "drupal/ds": "3.19.0", + "drupal/ds": "3.20.0", "drupal/dynamic_entity_reference": "3.2.0", "drupal/embed": "1.7.0", "drupal/encrypt": "3.1.0", @@ -57,7 +57,7 @@ "drupal/events_log_track": "3.1.9", "drupal/facets": "2.0.7", "drupal/field_group": "3.4.0", - "drupal/focal_point": "2.0.2", + "drupal/focal_point": "2.0.3", "drupal/google_analytics": "4.0.2", "drupal/govcms_dlm": "2.0.0", "drupal/inline_entity_form": "3.0.0-rc19", @@ -66,7 +66,7 @@ "drupal/layout_builder_modal": "1.2.0", "drupal/layout_builder_restrictions": "2.19.0", "drupal/linked_field": "1.5.0", - "drupal/linkit": "6.1.2", + "drupal/linkit": "6.1.3", "drupal/login_security": "2.0.1", "drupal/mailsystem": "4.4.0", "drupal/media_entity_file_replace": "1.2.0", @@ -95,7 +95,7 @@ "drupal/scheduled_transitions": "2.4.1", "drupal/search_api": "1.31.0", "drupal/search_api_attachments": "9.0.2", - "drupal/search_api_solr": "4.3.1", + "drupal/search_api_solr": "4.3.2", "drupal/seckit": "2.0.1", "drupal/securitytxt": "1.4.0", "drupal/shield": "1.7.0", diff --git a/govcms.info.yml b/govcms.info.yml index ed2c9aa3c..01edfed9f 100644 --- a/govcms.info.yml +++ b/govcms.info.yml @@ -3,7 +3,7 @@ type: profile description: 'A GovCMS Drupal Distribution for government and the public sector in Australia.' core_version_requirement: ^10 project: 'govcms' -version: '3.10.0' +version: '3.11.0' distribution: name: GovCMS diff --git a/includes/govcms.update.inc b/includes/govcms.update.inc index 6595a99e2..d4951b4c8 100644 --- a/includes/govcms.update.inc +++ b/includes/govcms.update.inc @@ -121,3 +121,18 @@ function govcms_update_10005() { // Call the service method to uninstall specified modules marked as 'obsolete'. $lifecycle_service->uninstallObsoleteModules($modules_to_uninstall); } + +/** + * Implements hook_update_N(). + * Uninstall rdf, quickedit, and adminimal_admin_toolbar module if marked as 'obsolete'. + */ +function govcms_update_10006() { + // Get the Lifecycle service. + $lifecycle_service = \Drupal::service('govcms.modules.lifecycle'); + + // List of modules to uninstall. + $modules_to_uninstall = ['rdf', 'quickedit', 'adminimal_admin_toolbar']; + + // Call the service method to uninstall specified modules marked as 'obsolete'. + $lifecycle_service->uninstallObsoleteModules($modules_to_uninstall); +} diff --git a/modules/obsolete/features/features.info.yml b/modules/obsolete/features/features.info.yml deleted file mode 100644 index 87f1cd5d0..000000000 --- a/modules/obsolete/features/features.info.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Features -type: module -description: 'Enables administrators to package configuration into modules. [obsolete]' -package: GovCMS [obsolete] -core_version_requirement: ^9 || ^10 -lifecycle: obsolete -lifecycle_link: 'https://github.com/GovCMS/GovCMS' diff --git a/modules/obsolete/features/features_ui.info.yml b/modules/obsolete/features/features_ui.info.yml deleted file mode 100644 index 88e44c0aa..000000000 --- a/modules/obsolete/features/features_ui.info.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Features UI -type: module -description: 'Provides the user interface for Features. [obsolete]' -package: GovCMS [obsolete] -core_version_requirement: ^9 || ^10 -lifecycle: obsolete -lifecycle_link: 'https://github.com/GovCMS/GovCMS' diff --git a/modules/obsolete/govcms_media/govcms_media.info.yml b/modules/obsolete/govcms_media/govcms_media.info.yml deleted file mode 100644 index b13eda1cd..000000000 --- a/modules/obsolete/govcms_media/govcms_media.info.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: 'GovCMS Media' -type: module -description: 'Provide media management functionality. [obsolete]' -package: GovCMS [obsolete] -core_version_requirement: ^9 || ^10 -lifecycle: obsolete -lifecycle_link: 'https://github.com/GovCMS/GovCMS' diff --git a/modules/obsolete/govcms_news_and_media/govcms_news_and_media.info.yml b/modules/obsolete/govcms_news_and_media/govcms_news_and_media.info.yml deleted file mode 100644 index ed02a463d..000000000 --- a/modules/obsolete/govcms_news_and_media/govcms_news_and_media.info.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: 'News and Media' -type: module -description: 'Provides News and Media content type and related configuration. [obsolete]' -package: GovCMS [obsolete] -core_version_requirement: ^9 || ^10 -lifecycle: obsolete -lifecycle_link: 'https://github.com/GovCMS/GovCMS' diff --git a/modules/obsolete/govcms_search/govcms_search.info.yml b/modules/obsolete/govcms_search/govcms_search.info.yml deleted file mode 100644 index 11737c614..000000000 --- a/modules/obsolete/govcms_search/govcms_search.info.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: 'GovCMS Search' -type: module -description: 'Provide default search functions. [obsolete]' -package: GovCMS [obsolete] -core_version_requirement: ^9 || ^10 -lifecycle: obsolete -lifecycle_link: 'https://github.com/GovCMS/GovCMS' diff --git a/modules/obsolete/govcms_standard_page/govcms_standard_page.info.yml b/modules/obsolete/govcms_standard_page/govcms_standard_page.info.yml deleted file mode 100644 index e9aac52f8..000000000 --- a/modules/obsolete/govcms_standard_page/govcms_standard_page.info.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: 'Standard page' -type: module -description: 'Provides Standard page content type and related configuration. [obsolete]' -package: GovCMS [obsolete] -core_version_requirement: ^9 || ^10 -lifecycle: obsolete -lifecycle_link: 'https://github.com/GovCMS/GovCMS'