Skip to content

Commit

Permalink
Merge branch 'release/3.x/3.11.0' into 3.x-master
Browse files Browse the repository at this point in the history
  • Loading branch information
Tara committed Apr 14, 2024
2 parents c0ff656 + d94400e commit e7069e7
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 48 deletions.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion govcms.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions includes/govcms.update.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
7 changes: 0 additions & 7 deletions modules/obsolete/features/features.info.yml

This file was deleted.

7 changes: 0 additions & 7 deletions modules/obsolete/features/features_ui.info.yml

This file was deleted.

7 changes: 0 additions & 7 deletions modules/obsolete/govcms_media/govcms_media.info.yml

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions modules/obsolete/govcms_search/govcms_search.info.yml

This file was deleted.

This file was deleted.

0 comments on commit e7069e7

Please sign in to comment.