From a83ed615268c8a5366f6f139e149ada228a40dfd Mon Sep 17 00:00:00 2001
From: Aaron Bauman <aaron@messageagency.com>
Date: Thu, 21 May 2020 11:16:41 -0400
Subject: [PATCH] Update version requirements for D9 readiness
---
composer.json | 8 ++++----
modules/salesforce_example/salesforce_example.info.yml | 2 +-
modules/salesforce_jwt/salesforce_jwt.info.yml | 3 +--
modules/salesforce_logger/salesforce_logger.info.yml | 3 +--
modules/salesforce_mapping/salesforce_mapping.info.yml | 5 ++---
.../salesforce_mapping_test.info.yml | 1 -
.../salesforce_mapping_ui/salesforce_mapping_ui.info.yml | 3 +--
modules/salesforce_oauth/salesforce_oauth.info.yml | 3 +--
modules/salesforce_pull/salesforce_pull.info.yml | 3 +--
modules/salesforce_push/salesforce_push.info.yml | 3 +--
modules/salesforce_soap/salesforce_soap.info.yml | 3 +--
modules/salesforce_webform/salesforce_webform.info.yml | 4 ++--
salesforce.info.yml | 3 +--
.../salesforce_test_rest_client.info.yml | 2 +-
14 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/composer.json b/composer.json
index c55432a2..1f2064a6 100644
--- a/composer.json
+++ b/composer.json
@@ -32,11 +32,11 @@
}
},
"require": {
- "drupal/core": "^8 || ^9",
+ "drupal/core": "^8.7.7 || ^9",
"consolidation/output-formatters": "^3.2.0",
- "drupal/dynamic_entity_reference": "^2.0@alpha",
- "drupal/key": "^1.7",
- "drupal/typed_data": "^1.0@alpha",
+ "drupal/dynamic_entity_reference": "^2.0@alpha10",
+ "drupal/key": "1.x-dev",
+ "drupal/typed_data": "1.x-dev",
"firebase/php-jwt": "^5.0",
"lusitanian/oauth": "^0.8.11",
"ext-json": "*"
diff --git a/modules/salesforce_example/salesforce_example.info.yml b/modules/salesforce_example/salesforce_example.info.yml
index fb31c9a8..576c654b 100644
--- a/modules/salesforce_example/salesforce_example.info.yml
+++ b/modules/salesforce_example/salesforce_example.info.yml
@@ -1,7 +1,7 @@
name: Salesforce Example
type: module
description: Salesforce Examples
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9
package: Salesforce
dependencies:
- salesforce:salesforce_push
diff --git a/modules/salesforce_jwt/salesforce_jwt.info.yml b/modules/salesforce_jwt/salesforce_jwt.info.yml
index 36562825..a1a109a8 100644
--- a/modules/salesforce_jwt/salesforce_jwt.info.yml
+++ b/modules/salesforce_jwt/salesforce_jwt.info.yml
@@ -1,8 +1,7 @@
name: Salesforce JWT Auth Provider
type: module
description: Provides key-based Salesforce authentication.
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
package: Salesforce
configure: salesforce.auth_config
dependencies:
diff --git a/modules/salesforce_logger/salesforce_logger.info.yml b/modules/salesforce_logger/salesforce_logger.info.yml
index 9f9ca3fb..2dc3e376 100644
--- a/modules/salesforce_logger/salesforce_logger.info.yml
+++ b/modules/salesforce_logger/salesforce_logger.info.yml
@@ -1,8 +1,7 @@
name: Salesforce Logger
type: module
description: Consolidated logging for Salesforce Log events.
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
package: Salesforce
configure: salesforce_logger.settings
dependencies:
diff --git a/modules/salesforce_mapping/salesforce_mapping.info.yml b/modules/salesforce_mapping/salesforce_mapping.info.yml
index 7965eacd..d20a76d1 100644
--- a/modules/salesforce_mapping/salesforce_mapping.info.yml
+++ b/modules/salesforce_mapping/salesforce_mapping.info.yml
@@ -2,9 +2,8 @@ name: Salesforce Mapping
type: module
description: Map Drupal entities to Salesforce objects.
package: Salesforce
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
dependencies:
- salesforce:salesforce
- - dynamic_entity_reference:dynamic_entity_reference (2.x)
+ - dynamic_entity_reference:dynamic_entity_reference (>= 2.0-alpha10)
- typed_data:typed_data
diff --git a/modules/salesforce_mapping/tests/modules/salesforce_mapping_test/salesforce_mapping_test.info.yml b/modules/salesforce_mapping/tests/modules/salesforce_mapping_test/salesforce_mapping_test.info.yml
index f6025c97..fc2cada0 100644
--- a/modules/salesforce_mapping/tests/modules/salesforce_mapping_test/salesforce_mapping_test.info.yml
+++ b/modules/salesforce_mapping/tests/modules/salesforce_mapping_test/salesforce_mapping_test.info.yml
@@ -2,7 +2,6 @@ name: "Salesforce mapping test module"
type: module
description: "Salesforce mapping test module"
package: Testing
-core: 8.x
dependencies:
- text
- datetime
diff --git a/modules/salesforce_mapping_ui/salesforce_mapping_ui.info.yml b/modules/salesforce_mapping_ui/salesforce_mapping_ui.info.yml
index 9d4c31d8..3c932ced 100644
--- a/modules/salesforce_mapping_ui/salesforce_mapping_ui.info.yml
+++ b/modules/salesforce_mapping_ui/salesforce_mapping_ui.info.yml
@@ -2,8 +2,7 @@ name: Salesforce Mapping UI
type: module
description: User interface for managing Salesforce mappings.
package: Salesforce
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
configure: entity.salesforce_mapping.list
dependencies:
- salesforce:salesforce_mapping
diff --git a/modules/salesforce_oauth/salesforce_oauth.info.yml b/modules/salesforce_oauth/salesforce_oauth.info.yml
index 815713ba..74987b34 100644
--- a/modules/salesforce_oauth/salesforce_oauth.info.yml
+++ b/modules/salesforce_oauth/salesforce_oauth.info.yml
@@ -1,8 +1,7 @@
name: Salesforce OAuth user-agent Provider
type: module
description: Provides user-agent-based Salesforce OAuth authentication.
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
package: Salesforce
configure: salesforce.auth_config
dependencies:
diff --git a/modules/salesforce_pull/salesforce_pull.info.yml b/modules/salesforce_pull/salesforce_pull.info.yml
index 292d728c..ed75a8d6 100644
--- a/modules/salesforce_pull/salesforce_pull.info.yml
+++ b/modules/salesforce_pull/salesforce_pull.info.yml
@@ -2,7 +2,6 @@ name: Salesforce Pull
type: module
description: Imports objects from Salesforce based on mappings defined in Salesforce Mapping.
package: Salesforce
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
dependencies:
- salesforce:salesforce_mapping
diff --git a/modules/salesforce_push/salesforce_push.info.yml b/modules/salesforce_push/salesforce_push.info.yml
index cc2693aa..8d078134 100644
--- a/modules/salesforce_push/salesforce_push.info.yml
+++ b/modules/salesforce_push/salesforce_push.info.yml
@@ -2,7 +2,6 @@ name: Salesforce Push
type: module
description: Push data to Salesforce when updates are made to Drupal entities.
package: Salesforce
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
dependencies:
- salesforce:salesforce_mapping
diff --git a/modules/salesforce_soap/salesforce_soap.info.yml b/modules/salesforce_soap/salesforce_soap.info.yml
index 304524a5..363ddedf 100644
--- a/modules/salesforce_soap/salesforce_soap.info.yml
+++ b/modules/salesforce_soap/salesforce_soap.info.yml
@@ -2,7 +2,6 @@ name: Salesforce Soap
type: module
description: Exposes a SoapClient service for communicating with the Salesforce SOAP API.
package: Salesforce
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
dependencies:
- salesforce:salesforce
diff --git a/modules/salesforce_webform/salesforce_webform.info.yml b/modules/salesforce_webform/salesforce_webform.info.yml
index a2e9fbe2..666d5504 100644
--- a/modules/salesforce_webform/salesforce_webform.info.yml
+++ b/modules/salesforce_webform/salesforce_webform.info.yml
@@ -2,8 +2,8 @@ name: Salesforce Webform
type: module
description: Adds support for webforms fields in Salesforce Mapping.
package: Salesforce
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9
dependencies:
- salesforce:salesforce_mapping
- - webform:webform
+ - webform:webform (>= 5.9-beta1)
diff --git a/salesforce.info.yml b/salesforce.info.yml
index 5597ba53..e538937e 100644
--- a/salesforce.info.yml
+++ b/salesforce.info.yml
@@ -2,8 +2,7 @@ name: Salesforce Integration
type: module
description: Modules to integrate Drupal and Salesforce
package: Salesforce
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.7.7 || ^9
configure: salesforce.admin_config_salesforce
dependencies:
typed_data:typed_data
diff --git a/tests/modules/salesforce_test_rest_client/salesforce_test_rest_client.info.yml b/tests/modules/salesforce_test_rest_client/salesforce_test_rest_client.info.yml
index ae471f4d..883df79a 100644
--- a/tests/modules/salesforce_test_rest_client/salesforce_test_rest_client.info.yml
+++ b/tests/modules/salesforce_test_rest_client/salesforce_test_rest_client.info.yml
@@ -2,6 +2,6 @@ name: 'Salesforce Test Rest Client'
type: module
description: 'Provides a dummy Rest Client for functional tests.'
package: Testing
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9
dependencies:
- salesforce:salesforce
--
GitLab