From 770cabc65a83f80152a47ca4fad722193855a4d5 Mon Sep 17 00:00:00 2001 From: Francesco Sardara Date: Thu, 23 Feb 2023 18:26:49 +0100 Subject: [PATCH] OEL-2115: Raise dependencies and drop the ones added for lower dependency tests. --- .drone.yml | 2 +- composer.json | 29 +++++++---------------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7383a9257..c013abb8e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,7 +55,7 @@ pipeline: - /cache/${DRONE_REPO_NAME}:/cache commands: - composer self-update --2 - - composer require drupal/core:~${CORE_VERSION} drupal/core-composer-scaffold:~${CORE_VERSION} drupal/core-dev:~${CORE_VERSION} --update-with-all-dependencies --ansi --no-progress --no-interaction + - composer require drupal/core:~${CORE_VERSION} drupal/core-composer-scaffold:~${CORE_VERSION} --update-with-all-dependencies --ansi --no-progress --no-interaction site-install: image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci diff --git a/composer.json b/composer.json index 9811d1377..59fcf405e 100644 --- a/composer.json +++ b/composer.json @@ -6,9 +6,9 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": ">=7.4", + "php": ">=8.0", "cweagans/composer-patches": "^1.7", - "drupal/core": "^9.3", + "drupal/core": "^9.4", "drupal/daterange_compact": "^2.0", "drupal/twig_field_value": "^2.0", "openeuropa/composer-artifacts": "^1.0.0-alpha1", @@ -19,24 +19,17 @@ "drupal/better_exposed_filters": "^5.0", "drupal/composite_reference": "^2.1", "drupal/config_devel": "~1.2", - "drupal/core-composer-scaffold": "^9.3", - "drupal/core-dev": "^9.3", - "drupal/ctools": "^3.7", + "drupal/core-composer-scaffold": "^9.4", "drupal/description_list_field": "^1.0@alpha", - "drupal/drupal-extension": "~4.1", + "drupal/drupal-extension": "^5.0.0alpha1", "drupal/entity_reference_revisions": "^1.9", "drupal/extra_field": "^2.1", "drupal/facets_form": "1.0.0-alpha3", "drupal/field_group": "^3.2", - "drupal/inline_entity_form": "^1.0-rc12", "drupal/search_api": "^1.21", "drupal/search_api_autocomplete": "^1.5", - "drupal/token": "^1.10", "drupal/typed_link": "^2.0", - "drush/drush": "^10.3", - "easyrdf/easyrdf": "1.0.0 as 0.9.1", - "league/csv": "^9.1", - "nikic/php-parser": "^4.13", + "drush/drush": "^11.1", "openeuropa/code-review": "^2.0", "openeuropa/oe_authentication": "^1.8", "openeuropa/oe_contact_forms": "~1.5", @@ -47,9 +40,8 @@ "openeuropa/oe_multilingual": "^1.11", "openeuropa/oe_paragraphs": "^1.17", "openeuropa/oe_starter_content": "^1.0.0", - "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5", - "phpspec/prophecy-phpunit": "^2", - "symfony/dom-crawler": "^4.4.12" + "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6", + "phpspec/prophecy-phpunit": "^2" }, "scripts": { "post-install-cmd": "./vendor/bin/run drupal:site-setup", @@ -97,13 +89,6 @@ "web-root": "./build" } }, - "_readme": [ - "Explicit minimum version requirement of drupal/ctools module due to D9.3 compatibility.", - "Explicit requirement for league/csv due to PHP 8.0 compatibility", - "Explicit minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8.", - "Explicit requirement of token module due to PHP 8 compatbility.", - "Explicit minimum version requirement of drupal/inline_entity_form due to failing patch in lower versions. To be removed once oe_media required the same minimum version." - ], "installer-paths": { "build/core": [ "type:drupal-core"