From e7bb99d963a6688ca660e505de7f5729b1080814 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Thu, 21 Jul 2022 13:48:37 -0300
Subject: [PATCH 1/2] Test with php 8.1.

---
 .github/workflows/build-2.x.yml | 35 ++++-----------------------------
 composer.json                   |  3 +++
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index 5e2735b..77ea1d9 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -4,7 +4,7 @@ name: CI
 
 # Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the 7.x branch
+  # Triggers the workflow on push or pull request events but only for the 2.x branch
   push:
     branches: [ 2.x ]
   pull_request:
@@ -22,37 +22,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ["7.3", "7.4"]
-        drupal-version: ["9.3.x", "9.4.x-dev"]
+        php-versions: ["7.4", "8.0", "8.1"]
+        drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev"]
         allowed_failure: [false]
-        mysql: ["5.7"]
-        # include experimental parts
-        include:
-          # 9.3.x on PHP 8.0
-          - drupal-version: '9.3.x'
-            php-versions: '8.0'
-            mysql: "8.0"
-            allowed_failure: true
-          # 9.3.x on PHP 8.1
-          - drupal-version: '9.3.x'
-            php-versions: '8.1'
-            mysql: "8.0"
-            allowed_failure: true
-          # 9.4.x-dev on PHP "8.0"
-          - drupal-version: '9.4.x-dev'
-            php-versions: '8.0'
-            mysql: "8.0"
-            allowed_failure: true
-          # 9.4.x-dev on PHP 8.1
-          - drupal-version: '9.4.x-dev'
-            php-versions: '8.1'
-            mysql: "8.0"
-            allowed_failure: true
-          # 10.0.x-dev on PHP 8.1
-          - drupal-version: '10.0.x-dev'
-            php-versions: '8.1'
-            mysql: "8.0"
-            allowed_failure: true
+        mysql: ["8.0"]
 
     name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }}
     env:
diff --git a/composer.json b/composer.json
index 6467a64..206e012 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,9 @@
   "require": {
     "drupal/token": "^1.3"
   },
+  "conflict": {
+      "drupal/core": "<=8"
+  },
   "authors": [
     {
       "name": "Islandora Foundation",

From ed21fa500f36b5c7de64d6006fe0807f46791803 Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Thu, 21 Jul 2022 14:21:44 -0300
Subject: [PATCH 2/2] Deprecate D8.

---
 openseadragon.info.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openseadragon.info.yml b/openseadragon.info.yml
index 043824d..1481818 100644
--- a/openseadragon.info.yml
+++ b/openseadragon.info.yml
@@ -2,8 +2,7 @@ name: 'OpenSeadragon Viewer'
 type: module
 description: 'A light-weight, customizable OpenSeadragon field formatter'
 package: Media
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9
 dependencies:
   - token
 configure: openseadragon.admin_settings