From f480b3f07ac94e94754e163a6eab3e2fafa0de18 Mon Sep 17 00:00:00 2001
From: Dominic Tubach <tubach@systopia.de>
Date: Wed, 24 Jan 2024 16:32:11 +0100
Subject: [PATCH] Require `drupal/cmrf_core` 2.1 for APIv4 compatibility

---
 composer.json                                | 5 ++++-
 modules/civiremote_activity/ci/composer.json | 8 --------
 modules/civiremote_entity/ci/composer.json   | 5 ++++-
 modules/civiremote_entity/composer.json      | 8 --------
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 368f503..e0e757d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,6 +12,9 @@
     "homepage": "https://github.com/systopia/civiremote",
     "require": {
         "beberlei/assert": "*",
-        "drupal/cmrf_core": "^1.0@beta | ^2.0@beta"
+        "drupal/cmrf_core": "^2.1@beta"
+    },
+    "conflict": {
+        "drupal/cmrf_core": "2.1.0-beta5"
     }
 }
diff --git a/modules/civiremote_activity/ci/composer.json b/modules/civiremote_activity/ci/composer.json
index 2e52df8..1967b47 100644
--- a/modules/civiremote_activity/ci/composer.json
+++ b/modules/civiremote_activity/ci/composer.json
@@ -9,14 +9,6 @@
             "type": "vcs",
             "url": "https://github.com/systopia/drupal-json_forms.git"
         },
-        {
-            "type": "vcs",
-            "url": "https://github.com/systopia/opis-json-schema-ext.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/systopia/expression-language-ext.git"
-        },
         {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
diff --git a/modules/civiremote_entity/ci/composer.json b/modules/civiremote_entity/ci/composer.json
index c4687b3..3f6657a 100644
--- a/modules/civiremote_entity/ci/composer.json
+++ b/modules/civiremote_entity/ci/composer.json
@@ -11,7 +11,10 @@
         }
     ],
     "require": {
-        "drupal/cmrf_core": "^2.0",
+        "drupal/cmrf_core": "^2.1",
         "drupal/core": "^9.5 || ^10"
+    },
+    "conflict": {
+        "drupal/cmrf_core": "2.1.0-beta5"
     }
 }
diff --git a/modules/civiremote_entity/composer.json b/modules/civiremote_entity/composer.json
index d358370..9031a0a 100644
--- a/modules/civiremote_entity/composer.json
+++ b/modules/civiremote_entity/composer.json
@@ -33,14 +33,6 @@
             "type": "vcs",
             "url": "https://github.com/systopia/drupal-json_forms.git"
         },
-        {
-            "type": "vcs",
-            "url": "https://github.com/systopia/opis-json-schema-ext.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/systopia/expression-language-ext.git"
-        },
         {
             "type": "composer",
             "url": "https://packages.drupal.org/8"