Merge pull request #199 from YCloudYUSA/podarok-patch-1

feat: [DS-1539] Upgrade to supported search_api and core
YCloudYUSA · Jun 19, 2024 · 790522e · 790522e
2 parents 5fa6607 + bd2c3da
commit 790522e
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -24,10 +24,10 @@
         "drupal/colorbutton": "^1",
         "drupal/confi": "^3.1",
         "drupal/config_update": "^1.6 || ^2 || ^2.0@alpha",
-        "drupal/core": "^9.5.9 || ^10.0.9, <10.3",
-        "drupal/core-composer-scaffold": "^9.5.9 || ^10.1, <10.3",
-        "drupal/core-project-message": "^9.5.9 || ^10.1, <10.3",
-        "drupal/core-recommended": "^9.5.9 || ^10.1, <10.3",
+        "drupal/core": "^10.0.9, <10.3",
+        "drupal/core-composer-scaffold": "^10.1, <10.3",
+        "drupal/core-project-message": "^10.1, <10.3",
+        "drupal/core-recommended": "^10.1, <10.3",
         "drupal/crop": "^2",
         "drupal/css_editor": "^1.3 || ^2",
         "drupal/csv_serialization": "^3 || ^3.0@beta",
@@ -90,8 +90,8 @@
         "drupal/redirect": "^1",
         "drupal/responsive_favicons": "^2.0",
         "drupal/scheduler": "^2 || ^2.0@RC",
-        "drupal/search_api": "1.17 || ^1.19",
-        "drupal/search_api_solr": "^4.1",
+        "drupal/search_api": "^1.31",
+        "drupal/search_api_solr": "^4.3.1",
         "drupal/seven": "^1 || ^1.0@alpha",
         "drupal/simple_menu_icons": "^2.2 || ^3",
         "drupal/simple_sitemap": "^3.7 || ^4.1",
@@ -390,6 +390,13 @@
             },
             "drupal/redirect": {
                 "Issue #3373123: Setting 'Enforce clean and canonical URLs.' breaks CSS aggregation on multilingual Drupal 10.1.x with browser caching enabled": "https://git.drupalcode.org/project/redirect/-/merge_requests/93.patch"
+            },
+            "drupal/search_api": {
+                "First https://www.drupal.org/project/search_api_solr/issues/3449292#comment-15644442": "https://www.drupal.org/files/issues/2024-06-17/3454939-search-api-solr-core-10.patch",
+                "Second https://www.drupal.org/project/search_api_solr/issues/3449292#comment-15644442": "https://git.drupalcode.org/project/search_api/-/merge_requests/148.diff"
+            },
+            "drupal/search_api_solr": {
+                "https://www.drupal.org/project/search_api_solr/issues/3449292#comment-15644442": "https://www.drupal.org/files/issues/2024-06-17/search-api-solr-fatal-error-declaration-of-sleep-3449292-12.patch"
             }
         }
     },