From 849b12af4f6025db33860da3af2583fc625bb0b3 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Wed, 26 Jun 2024 18:24:54 -0300
Subject: [PATCH] D10.3 (#1032)

* Deprecate 10.1, add 10.4.x-dev.
* Correct permission list.
---
 .github/workflows/build-2.x.yml                      |  6 +-----
 islandora.info.yml                                   |  2 +-
 tests/src/Functional/DeleteMediaTest.php             |  7 +------
 tests/src/Functional/JsonldTypeAlterReactionTest.php | 10 +---------
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index 8cd9f1d1e..8677ddf4e 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -22,13 +22,9 @@ jobs:
       matrix:
         php-versions: ["8.1", "8.2", "8.3"]
         test-suite: ["kernel", "functional", "functional-javascript"]
-        drupal-version: ["10.1.x", "10.2.x", "10.3.x-dev"]
+        drupal-version: ["10.2.x", "10.3.x", "10.4.x-dev"]
         mysql: ["8.0"]
         allowed_failure: [false]
-        exclude:
-          - php-versions: "8.3"
-            drupal-version: "10.1.x"
-
 
     name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }}
 
diff --git a/islandora.info.yml b/islandora.info.yml
index 6dd0597f2..a43196a42 100644
--- a/islandora.info.yml
+++ b/islandora.info.yml
@@ -4,7 +4,7 @@ name: 'islandora'
 description: "Islandora Core"
 type: module
 package: Islandora
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^10.2
 dependencies:
   - context:context_ui
   - ctools:ctools
diff --git a/tests/src/Functional/DeleteMediaTest.php b/tests/src/Functional/DeleteMediaTest.php
index 957146fdc..76298501a 100644
--- a/tests/src/Functional/DeleteMediaTest.php
+++ b/tests/src/Functional/DeleteMediaTest.php
@@ -50,12 +50,7 @@ class DeleteMediaTest extends IslandoraFunctionalTestBase {
   public function setUp(): void {
     parent::setUp();
 
-    if (version_compare(\Drupal::VERSION, '10.1', '>=')) {
-      $permissions = ['create media', 'delete any media', 'delete any file'];
-    }
-    else {
-      $permissions = ['create media', 'delete any media'];
-    }
+    $permissions = ['create media', 'delete any media', 'delete any file'];
 
     // Create a test user.
     $this->account = $this->createUser($permissions);
diff --git a/tests/src/Functional/JsonldTypeAlterReactionTest.php b/tests/src/Functional/JsonldTypeAlterReactionTest.php
index 6ac70d7da..7e2005842 100644
--- a/tests/src/Functional/JsonldTypeAlterReactionTest.php
+++ b/tests/src/Functional/JsonldTypeAlterReactionTest.php
@@ -26,15 +26,7 @@ public function testMappingReaction() {
 
     // Add the typed predicate we will select in the reaction config.
     // Taken from FieldUiTestTrait->fieldUIAddNewField.
-    if (version_compare(\Drupal::VERSION, '10.2.x-dev', 'lt')) {
-      $this->submitForm([
-        'new_storage_type' => 'string',
-        'label' => 'Typed Predicate',
-        'field_name' => 'type_predicate',
-      ], 'Save and continue');
-      $this->submitForm([], 'Save field settings');
-    }
-    elseif (version_compare(\Drupal::VERSION, '10.3.x-dev', 'lt')) {
+    if (version_compare(\Drupal::VERSION, '10.3.x-dev', 'lt')) {
       $this->getSession()->getPage()->selectFieldOption('new_storage_type', 'plain_text');
       // For Drupal 10.2, we first need to submit the form with the elements
       // displayed on initial page load. The form is using AJAX to send a