Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumped version for Drupal10 support #844

Merged
merged 7 commits into from
Jun 9, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@ jobs:
fail-fast: false
matrix:
php-version:
- "7.4"
# - "7.4"
- "8.0"
- "8.1"
drupal-core:
# 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"

steps:

Expand Down Expand Up @@ -90,7 +93,7 @@ jobs:
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 'drupal/rules:3.x-dev@dev'
composer require wikimedia/composer-merge-plugin
composer config --json extra.merge-plugin.require '["modules/contrib/apigee_edge/composer.json"]'
composer config platform.php ${{ matrix.php-version }}
Expand Down
4 changes: 2 additions & 2 deletions apigee_edge.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Apigee Edge Drupal integration.
package: Apigee

type: module
core_version_requirement: ^8.7.7 || ^9
core_version_requirement: ^9 || ^10
divya-intelli marked this conversation as resolved.
Show resolved Hide resolved

dependencies:
- drupal:file
Expand All @@ -16,4 +16,4 @@ dependencies:

configure: apigee_edge.settings

php: "7.1"
php: "8.0"
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
"type": "drupal-module",
"description": "Apigee Edge for Drupal.",
"require": {
"php": "^7.4 || ^8.0",
"php": "^8.0",
"ext-json": "*",
"apigee/apigee-client-php": "^2.0.19",
"drupal/core": "^9.4",
"apigee/apigee-client-php": "dev-drupal10-prep",
"drupal/core": "^9.4 || ^10.0",
"drupal/entity": "^1.0",
"drupal/key": "^1.8",
"php-http/guzzle6-adapter": "^2.0"
"php-http/guzzle7-adapter": "^1.0"
},
"require-dev": {
"apigee/apigee-mock-client-php": "^1.1.1",
"apigee/apigee-mock-client-php": "dev-drupal10-prep",
"behat/mink-extension": "^2.0",
"bex/behat-screenshot": "^1.2",
"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": "^9.0 || ^10.0 || ^11.5",
"mglaman/drupal-check": "1.3",
"phpmd/phpmd": "^2.8.2",
"phpmetrics/phpmetrics": "^2.5",
Expand Down
2 changes: 1 addition & 1 deletion modules/apigee_edge_actions/apigee_edge_actions.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Apigee Edge Actions
description: Rules integration for Apigee Edge.
package: Apigee (Experimental)
type: module
core_version_requirement: ^8 || ^9
core_version_requirement: ^9 || ^10
configure: entity.rules_reaction_rule.collection
dependencies:
- apigee_edge:apigee_edge
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ description: Role based access control over view operation on API products.
package: Apigee

type: module
core_version_requirement: ^8 || ^9
core_version_requirement: ^9 || ^10
divya-intelli marked this conversation as resolved.
Show resolved Hide resolved

dependencies:
- apigee_edge:apigee_edge

configure: apigee_edge.settings.developer.api_product_access

php: "7.1"
php: "8.0"
4 changes: 2 additions & 2 deletions modules/apigee_edge_debug/apigee_edge_debug.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ description: Debug helper for Apigee Edge Drupal integration.
package: Apigee

type: module
core_version_requirement: ^8 || ^9
core_version_requirement: ^9 || ^10

dependencies:
- apigee_edge:apigee_edge

configure: apigee_edge_debug.settings

php: "7.1"
php: "8.0"
4 changes: 2 additions & 2 deletions modules/apigee_edge_teams/apigee_edge_teams.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Provides shared app functionality by allowing developers to be orga
package: Apigee

type: module
core_version_requirement: ^8 || ^9
core_version_requirement: ^9 || ^10

dependencies:
- apigee_edge:apigee_edge
Expand All @@ -12,4 +12,4 @@ dependencies:

configure: apigee_edge_teams.settings.team

php: "7.1"
php: "8.0"
2 changes: 1 addition & 1 deletion tests/modules/apigee_edge_test/apigee_edge_test.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Apigee Edge Testing'
type: module
description: 'Support module for the Apigee Edge tests.'
core_version_requirement: ^8 || ^9
core_version_requirement: ^9 || ^10
package: Testing

dependencies:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Apigee Edge Testing: App keys'
type: module
description: 'Support module for the Apigee Edge tests: Mocks app key generation via a 3rd party service.'
core_version_requirement: ^8 || ^9
core_version_requirement: ^9 || ^10
package: Testing

dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description: Helpers and an API middleware used for testing.
package: Apigee

type: module
core_version_requirement: ^8 || ^9
core_version_requirement: ^9 || ^10

dependencies:
- apigee_edge:apigee_edge

php: "7.1"
php: "8.0"