Merge pull request #930 from UN-OCHA/develop

Develop -> Main - v2.19.0
UN-OCHA · Oct 23, 2024 · c802ae8 · c802ae8
2 parents 7e6b55f + 087f479
commit c802ae8
Show file tree

Hide file tree

Showing 8 changed files with 837 additions and 243 deletions.
diff --git a/PATCHES/svg_image--3413668--drupal-10.2-compatibility.patch b/PATCHES/svg_image--3413668--drupal-10.2-compatibility.patch
diff --git a/composer.json b/composer.json
@@ -69,6 +69,7 @@
         "drush/drush": "^12",
         "elasticsearch/elasticsearch": "^8",
         "google/analytics-data": "^0.8.4",
+        "google/apiclient": "^2.17",
         "google/auth": "^1.21",
         "league/commonmark": "^2.2",
         "league/html-to-markdown": "^5.0",
@@ -119,7 +120,8 @@
             "orakili/composer-drupal-info-file-patch-helper": true,
             "phpstan/extension-installer": true,
             "symfony/flex": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "tbachert/spi": false
         },
         "audit": {
             "abandoned": "report",
@@ -143,6 +145,7 @@
         "pre-pool-create": [
             "scripts\\composer\\DrupalLenientRequirement::changeVersionConstraint"
         ],
+        "pre-autoload-dump": "Google\\Task\\Composer::cleanup",
         "git-hooks": "test -d .git && git config core.hooksPath git-hooks || exit 0",
         "sass-prepare": "cd html/themes/custom/common_design_subtheme && npm install",
         "sass-build": "cd html/themes/custom/common_design_subtheme && ./node_modules/.bin/sass sass:build",
@@ -161,6 +164,9 @@
         "patchLevel": {
             "drupal/core": "-p2"
         },
+        "google/apiclient-services": [
+                "Drive"
+        ],
         "installer-paths": {
             "html/core": [
                 "type:drupal-core"