Changes for bootstrap 5

apigee_devportal_kickstart.info.yml

@@ -56,6 +56,7 @@ install:
 - admin_toolbar
 - admin_toolbar_links_access_filter
 - admin_toolbar_tools
+- adminimal_admin_toolbar
 - apigee_edge
 - apigee_api_catalog
 - apigee_kickstart_customizer

apigee_devportal_kickstart.install

@@ -659,33 +659,17 @@ function apigee_devportal_kickstart_update_9001() {
  * Installing ckeditor5, claro, olivero.
  */
 function apigee_devportal_kickstart_update_9002() {
-  $module_handler = \Drupal::service('module_handler');
-  $theme_handler = \Drupal::service('theme_handler');
-  $module_installer = \Drupal::service('module_installer');
-  $theme_installer = \Drupal::service('theme_installer');
-
   // Install admin theme and frontend theme.
-  $theme_installer->install(['claro']);
-  $theme_installer->install(['olivero']);
+  \Drupal::service('theme_installer')->install(['claro']);
+  \Drupal::service('theme_installer')->install(['olivero']);
   // Set the admin theme as claro.Theme seven is deprecated and removed from Drupal 10.
   $config = \Drupal::service('config.factory')->getEditable('system.theme');
   $config->set('admin', 'claro')->save();
-
-  $deprecated_themes = ['seven', 'bartik'];
-  $deprecated_modules = ['hal', 'color'];
   // Uninstall deprecated theme and module.
-  foreach($deprecated_modules as $deprecated_module) {
-    if($module_handler->moduleExists($deprecated_module)) {
-      $module_installer->uninstall([$deprecated_module]);
-    }
-  }
-  foreach($deprecated_themes as $deprecated_theme) {
-    if($theme_handler->themeExists($deprecated_theme)) {
-      $theme_installer->uninstall([$deprecated_theme]);  
-    }
-  }
+  \Drupal::service('theme_installer')->uninstall(['seven', 'bartik']);
+  \Drupal::service('module_installer')->uninstall(['hal', 'color']);
   // Install ckeditor5 as it is recommened module.
-  $module_installer->install(['ckeditor5']);
+  \Drupal::service('module_installer')->install(['ckeditor5']);
 
   // id with node_type is deprecated in Drupal 9 and removed in Drupal 10.
   $configToImport = [
@@ -719,4 +703,4 @@ function apigee_devportal_kickstart_update_9002() {
 
   // Clear all caches.
   drupal_flush_all_caches();
-}
+}

composer.json

@@ -16,6 +16,7 @@
   "require": {
     "cweagans/composer-patches": "^1.6.5",
     "drupal/admin_toolbar": "^3.0",
+    "drupal/adminimal_admin_toolbar": "^1.9",
     "drupal/apigee_api_catalog": "^3",
     "drupal/apigee_edge": "^2.0.0 || ^3.0.0",
     "drupal/better_exposed_filters": "^5.0 || ^6.0",
@@ -24,15 +25,15 @@
     "drupal/fontawesome": "^2.12",
     "drupal/paragraphs": "^1.6",
     "drupal/pathauto": "^1.6",
-    "drupal/radix": "^4.13",
+    "drupal/radix": "^5.0",
     "drupal/components": "^2.1 || ^3.0@beta",
     "drupal/color": "^1.0",
     "drupal/quickedit": "^1.0",
     "drupal/rdf": "^2.1",
     "drupal/hal": "^1.0 || ^2.0"
   },
   "require-dev": {
-    "drupal/core-dev": "^9.5 || ^10.1",
+    "drupal/core-dev": "^9.4 || ^10.0",
     "drush/drush": "^11.5",
     "mglaman/drupal-check": "^1.3",
     "phpmd/phpmd": "^2.8.2",