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..0cba44f 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,8 @@ ], "require": { "drupal/admin_toolbar": "^3.0", - "drupal/content_lock": "^2.4", - "drupal/core": "^10.0", + "drupal/content_lock": "^3.0@alpha", + "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,11 +41,11 @@ "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/geofield_map": "^3.0" + "drupal/core-dev": "^10.0 || ^11.0", + "drupal/geofield_map": "^3.0 || ^11.0" }, "minimum-stability": "dev", "prefer-stable": true, 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: