From f2b0fb6b74a7b7f4152d87df1c6ceeee8d0aa93b Mon Sep 17 00:00:00 2001
From: shailesh-google <shail@google.com>
Date: Fri, 5 Jun 2026 17:03:44 +0530
Subject: [PATCH 1/2] added php8.4 and php8.5 support

---
 composer.json | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index c0a261666..5dc451a0b 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,36 @@
     "docs": "https://www.drupal.org/docs/8/modules/apigee-developer-portal-kickstart"
   },
   "repositories": [
+    {
+      "name": "forked-apigee_devportal_kickstart",
+      "type": "vcs",
+      "url": "https://github.com/shailesh-google/apigee-devportal-kickstart-drupal"
+    },
+    {
+      "name": "forked-apigee_m10n",
+      "type": "vcs",
+      "url": "https://github.com/shailesh-google/apigee-m10n-drupal"
+    },
+    {
+      "name": "forked-apigee_api_catalog",
+      "type": "vcs",
+      "url": "https://github.com/shailesh-google/apigee-api-catalog-drupal"
+    },
+    {
+      "name": "forked-apigee_edge",
+      "type": "vcs",
+      "url": "https://github.com/shailesh-google/apigee-edge-drupal"
+    },
+    {
+      "name": "forked-apigee-client-php",
+      "type": "vcs",
+      "url": "https://github.com/shailesh-google/apigee-client-php"
+    },
+    {
+      "name": "forked-apigee-mock-client-php",
+      "type": "vcs",
+      "url": "https://github.com/shailesh-google/apigee-mock-client-php"
+    },
     {
       "type": "composer",
       "url": "https://packages.drupal.org/8"
@@ -26,10 +56,10 @@
     }
   ],
   "require": {
-    "php": "~8.3.0",
-    "apigee/apigee_devportal_kickstart": "^3",
+    "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+    "apigee/apigee_devportal_kickstart": "dev-issue-791-3.x",
     "composer/installers": "^1.9",
-    "drupal/apigee_m10n": "^2.1.6",
+    "drupal/apigee_m10n": "dev-issue-617",
     "drupal/commerce": "^3.0",
     "drupal/core-composer-scaffold": "^11.3",
     "drupal/core-project-message": "^11.3",
@@ -41,7 +71,7 @@
     "drupal/adminimal_admin_toolbar": "^2.0"
   },
   "require-dev": {
-    "apigee/apigee-mock-client-php": "^1.1",
+    "apigee/apigee-mock-client-php": "dev-issue-14",
     "drupal/core-dev": "^11.3",
     "drush/drush": "^13.3"
   },

From 0d490ae9187f6ac03e9a2aaaab2706514acd6a08 Mon Sep 17 00:00:00 2001
From: shailesh-google <shail@google.com>
Date: Thu, 18 Jun 2026 10:20:13 +0530
Subject: [PATCH 2/2] Updated version of kickstart, mockclient and m10n module

---
 composer.json | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/composer.json b/composer.json
index 5dc451a0b..7fa7ce370 100644
--- a/composer.json
+++ b/composer.json
@@ -8,36 +8,6 @@
     "docs": "https://www.drupal.org/docs/8/modules/apigee-developer-portal-kickstart"
   },
   "repositories": [
-    {
-      "name": "forked-apigee_devportal_kickstart",
-      "type": "vcs",
-      "url": "https://github.com/shailesh-google/apigee-devportal-kickstart-drupal"
-    },
-    {
-      "name": "forked-apigee_m10n",
-      "type": "vcs",
-      "url": "https://github.com/shailesh-google/apigee-m10n-drupal"
-    },
-    {
-      "name": "forked-apigee_api_catalog",
-      "type": "vcs",
-      "url": "https://github.com/shailesh-google/apigee-api-catalog-drupal"
-    },
-    {
-      "name": "forked-apigee_edge",
-      "type": "vcs",
-      "url": "https://github.com/shailesh-google/apigee-edge-drupal"
-    },
-    {
-      "name": "forked-apigee-client-php",
-      "type": "vcs",
-      "url": "https://github.com/shailesh-google/apigee-client-php"
-    },
-    {
-      "name": "forked-apigee-mock-client-php",
-      "type": "vcs",
-      "url": "https://github.com/shailesh-google/apigee-mock-client-php"
-    },
     {
       "type": "composer",
       "url": "https://packages.drupal.org/8"
@@ -57,9 +27,9 @@
   ],
   "require": {
     "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
-    "apigee/apigee_devportal_kickstart": "dev-issue-791-3.x",
+    "apigee/apigee_devportal_kickstart": "^3.1.0",
     "composer/installers": "^1.9",
-    "drupal/apigee_m10n": "dev-issue-617",
+    "drupal/apigee_m10n": "^2.2.0",
     "drupal/commerce": "^3.0",
     "drupal/core-composer-scaffold": "^11.3",
     "drupal/core-project-message": "^11.3",
@@ -71,7 +41,7 @@
     "drupal/adminimal_admin_toolbar": "^2.0"
   },
   "require-dev": {
-    "apigee/apigee-mock-client-php": "dev-issue-14",
+    "apigee/apigee-mock-client-php": "^1.1.4",
     "drupal/core-dev": "^11.3",
     "drush/drush": "^13.3"
   },