From 68f0ea61e279d0910184d2f0ba8a74d9b4d5fefc Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:39:32 +0000 Subject: [PATCH 1/4] feat: drupal 11 support --- .github/workflows/test.yml | 2 +- composer.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 72246ae..80ed77b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ on: jobs: tests: - uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@1.x + uses: localgovdrupal/localgov_shared_workflows/.github/workflows/test-module.yml@feature/1.x/d11-support with: project: 'localgovdrupal/localgov' project_path: 'web/profiles/contrib/localgov' diff --git a/composer.json b/composer.json index 8397370..5abb63e 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "require": { "drupal/admin_toolbar": "^3.0", "drupal/content_lock": "^2.4", - "drupal/core": "^10.0", + "drupal/core": "^10.0 || ^11.0", "drupal/gin": "^3.0@alpha", "drupal/gin_login": "^2.0.3", "drupal/gin_toolbar": "^1.0@beta", @@ -23,7 +23,7 @@ "drupal/redirect": "^1.10", "drupal/simple_sitemap": "^4.1", "drupal/search_api": "^1.21", - "drush/drush": ">=10", + "drush/drush": ">=10 || >=13", "localgovdrupal/localgov_alert_banner": "^1.2.0", "localgovdrupal/localgov_base": "^1.3.1", "localgovdrupal/localgov_core": "^2.12.0", @@ -41,10 +41,10 @@ "localgovdrupal/localgov_subsites": "^2.3.0", "localgovdrupal/localgov_scarfolk": "^1.1.2", "localgovdrupal/localgov_workflows": "^1.2.0", - "php": ">=8.1.0" + "php": ">=8.1.0 || >=8.3.0" }, "require-dev": { - "drupal/core-dev": "^10.0", + "drupal/core-dev": "^10.0 || ^11.0", "drupal/geofield_map": "^3.0" }, "minimum-stability": "dev", From 91430696dbc250bdf3800d00f2e6e0b3e77476d6 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Thu, 12 Dec 2024 19:48:20 +0000 Subject: [PATCH 2/4] feat: drupal 11 support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5abb63e..8a1914d 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "drupal/admin_toolbar": "^3.0", - "drupal/content_lock": "^2.4", + "drupal/content_lock": "^3.0@alpha", "drupal/core": "^10.0 || ^11.0", "drupal/gin": "^3.0@alpha", "drupal/gin_login": "^2.0.3", From d630e3dda696bc42583bd8bdc913c495eea240c0 Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Tue, 31 Dec 2024 17:28:34 +0000 Subject: [PATCH 3/4] feat: drupal 11 support --- localgov.info.yml | 2 +- modules/localgov_content_lock/localgov_content_lock.info.yml | 2 +- .../localgov_login_redirect/localgov_login_redirect.info.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/localgov.info.yml b/localgov.info.yml index d0303c6..d24a913 100644 --- a/localgov.info.yml +++ b/localgov.info.yml @@ -1,7 +1,7 @@ name: LocalGov Drupal type: profile description: 'Install a LocalGov Drupal site.' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 install: # Core diff --git a/modules/localgov_content_lock/localgov_content_lock.info.yml b/modules/localgov_content_lock/localgov_content_lock.info.yml index 87602f3..4a5689c 100644 --- a/modules/localgov_content_lock/localgov_content_lock.info.yml +++ b/modules/localgov_content_lock/localgov_content_lock.info.yml @@ -2,7 +2,7 @@ name: LocalGov Content Lock type: module description: Customises the Content Lock module for use with LocalGov Drupal package: LocalGov Drupal -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 dependencies: - content_lock:content_lock - content_lock:content_lock_timeout diff --git a/modules/localgov_login_redirect/localgov_login_redirect.info.yml b/modules/localgov_login_redirect/localgov_login_redirect.info.yml index 928f1f8..711f5ab 100644 --- a/modules/localgov_login_redirect/localgov_login_redirect.info.yml +++ b/modules/localgov_login_redirect/localgov_login_redirect.info.yml @@ -2,7 +2,7 @@ name: LocalGov Login Redirect description: Simple module to redirect users at login. package: LocalGov Drupal type: module -core_version_requirement: ^9 || ^10 +core_version_requirement: ^10 || ^11 configure: localgov_login_redirect.settings dependencies: From d34dc9124ed46112218f3e7df445dff07baa5dfd Mon Sep 17 00:00:00 2001 From: Lee Mills <8024370+millnut@users.noreply.github.com> Date: Wed, 1 Jan 2025 15:56:43 +0000 Subject: [PATCH 4/4] fix: allow installation of geofield_map on d11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8a1914d..0cba44f 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ }, "require-dev": { "drupal/core-dev": "^10.0 || ^11.0", - "drupal/geofield_map": "^3.0" + "drupal/geofield_map": "^3.0 || ^11.0" }, "minimum-stability": "dev", "prefer-stable": true,