From c99ee499ea6993a200a8185e71ae22f95fbf3fba Mon Sep 17 00:00:00 2001
From: David Valdez <david.valdez210@gmail.com>
Date: Mon, 7 Sep 2020 16:17:22 -0500
Subject: [PATCH] Update several modules to make them work with D9

Also, several patches were added in some modules
---
 composer.json | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 928c3b2..9383488 100644
--- a/composer.json
+++ b/composer.json
@@ -15,11 +15,11 @@
         "drupal/ckeditor_markdown": "^1.1",
         "drupal/coffee": "1.x-dev",
         "drupal/comment_notify": "dev-1.x",
-        "drupal/core-recommended": "^9",
+        "drupal/core-recommended": "^8.8",
         "drupal/customerror": "1.x-dev",
         "drupal/diff": "^1.0@RC",
         "drupal/dropdown_language": "^2.2",
-        "drupal/drutopia_core": "1.x-dev",
+        "drupal/drutopia_core": "dev-update-to-drupal9 as 1.x-dev",
         "drupal/drutopia_site": "dev-1.x",
         "drupal/google_analytics": "^2.3",
         "drupal/honeypot": "^1.29",
@@ -34,7 +34,7 @@
         "drupal/migrate_tools": "^4.0",
         "drupal/mimemail": "^1.0@alpha",
         "drupal/minimalhtml": "^1.0",
-        "drupal/multiline_config": "^1.0",
+        "drupal/multiline_config": "dev-1.x",
         "drupal/paragraphs_features": "^1.4",
         "drupal/preview_link": "^1.1",
         "drupal/redirect": "^1.2",
@@ -53,7 +53,7 @@
         "drupal/webform_mailchimp": "^5.4",
         "drupal/wysiwyg_linebreaks": "1.x-dev",
         "drush/drush": "^10.0",
-        "drutopia/drutopia": "^1.x-dev",
+        "drutopia/drutopia": "dev-update-to-drupal9",
         "wikimedia/composer-merge-plugin": "^1.4",
         "zaporylie/composer-drupal-optimizations": "^1.0"
     },
@@ -70,8 +70,12 @@
         },
         "drutopia": {
             "type": "vcs",
-            "url": "https://github.com/drutopia/drutopia"
-        }
+            "url": "https://gitlab.com/drutopia/drutopia"
+        },
+	"drutopia_core": {
+	    "type": "vcs",
+	    "url": "https://gitlab.com/drutopia/drutopia_core"
+	}
     },
     "config": {
         "sort-packages": true,
@@ -118,7 +122,13 @@
             },
             "drupal/similarterms": {
                 "Compatibility with Drupal 9": "https://www.drupal.org/files/issues/2020-06-20/Compatibility_with_Drupal_9-3120089-5.patch"
-            }
+            },
+            "drupal/block_theme_sync": {
+                "Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-06-05/block_theme_sync.1.x-dev.rector.patch"
+            },
+	    "drupal/multiline_config": {
+		"Drupal 9 readiness for Multiline Config": "https://www.drupal.org/files/issues/2020-07-22/3109713-Drupal-support-13.patch"
+	    }
         }
     },
     "scripts": {