Merging drupal10-prep branch to 3.x (#228)

* Bumped drupal version (#223)
apigee · Jul 3, 2023 · 8f2d1de · 8f2d1de
1 parent 4dfc466
commit 8f2d1de
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -35,6 +35,11 @@ jobs:
           # Should update the following as the minimum supported version from Drupal.org
           - "9.4.x"
           - "9.5.x"
+        include:
+          - php-version: "8.1"
+            drupal-core: "10.0.x"
+          - php-version: "8.1"
+            drupal-core: "10.1.x"
 
     steps:
 
@@ -74,9 +79,7 @@ jobs:
         composer config --no-plugins allow-plugins.composer/package-versions-deprecated true
         composer config --no-plugins allow-plugins.cweagans/composer-patches true
         composer config --no-plugins allow-plugins.php-http/discovery true
-        composer require --dev drush/drush
         composer config minimum-stability dev
-        composer require drupal/rules:3.0.0-alpha7
         composer require wikimedia/composer-merge-plugin
         composer config --json extra.merge-plugin.require '["modules/contrib/apigee_api_catalog/composer.json"]'
         composer config platform.php ${{ matrix.php-version }}

diff --git a/apigee_api_catalog.info.yml b/apigee_api_catalog.info.yml
@@ -1,7 +1,7 @@
 name: 'Apigee API Catalog'
 type: module
 description: 'Display OpenAPI documentation of your APIs to your developers.'
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 package: 'Apigee'
 dependencies:
 - drupal:text

diff --git a/composer.json b/composer.json
@@ -4,16 +4,16 @@
     "type": "drupal-module",
     "description": "Apigee API Catalog for Drupal",
     "require": {
-        "php": "^8.0",
+        "php": "~8.0 || ~8.1",
         "drupal/entity": "^1.1",
         "drupal/file_link": "^2.0",
-        "drupal/apigee_edge": "^2.0",
+        "drupal/apigee_edge": "^2.0 || ^3.0.0",
         "webonyx/graphql-php": "^14.11"
     },
     "require-dev": {
         "cweagans/composer-patches": "^1.6",
-        "drupal/core-dev": "^9.4",
-        "drush/drush": "^9.0 || ^10.0",
+        "drupal/core-dev": "^9.4 || ^10.0",
+        "drush/drush": "^11.5",
         "mglaman/drupal-check": "^1.3",
         "phpmd/phpmd": "^2.8.2",
         "phpmetrics/phpmetrics": "^2.5",

diff --git a/modules/apigee_asyncapi_doc/apigee_asyncapi_doc.info.yml b/modules/apigee_asyncapi_doc/apigee_asyncapi_doc.info.yml
@@ -2,7 +2,7 @@ name: AsyncAPI for Apigee
 type: module
 description: AsyncAPI for Apigee
 package: Apigee (Experimental)
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 dependencies:
   - apigee_api_catalog
   - file_link

diff --git a/modules/apigee_freeform_doc/apigee_freeform_doc.info.yml b/modules/apigee_freeform_doc/apigee_freeform_doc.info.yml
@@ -2,7 +2,7 @@ name: Free-form documentation for Apigee
 type: module
 description: Free-form documentation for Apigee
 package: Apigee (Experimental)
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 dependencies:
   - apigee_api_catalog
   - file

diff --git a/modules/apigee_graphql_doc/apigee_graphql_doc.info.yml b/modules/apigee_graphql_doc/apigee_graphql_doc.info.yml
@@ -2,7 +2,7 @@ name: GraphQL for Apigee
 type: module
 description: GraphQL for Apigee
 package: Apigee (Experimental)
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 dependencies:
   - apigee_api_catalog
   - file_link