Update composer.json

markaspot · Apr 25, 2017 · f1d1434 · f1d1434
1 parent 9945a22
commit f1d1434
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Holger Kreis | @markaspot | http://mark-a-spot.org
 ## Installation
 
 ```
-$ git clone -b master-8.x --single-branch https://github.com/markaspot/mark-a-spot.git
+$ git clone -b master --single-branch https://github.com/markaspot/mark-a-spot.git
 $ cd mark-a-spot
 $ composer install
 ```
diff --git a/composer.json b/composer.json
@@ -247,9 +247,9 @@
         }
     ],
     "require": {
-        "composer/installers": "^1.2",
-        "drupal-composer/drupal-scaffold": "^2.2",
-        "cweagans/composer-patches": "~1.0",
+        "composer/installers": "^1.0",
+        "drupal-composer/drupal-scaffold": "^2.0.0",
+        "cweagans/composer-patches": "^1.6.0",
         "drush/drush": "~8.0",
         "commerceguys/intl": "~0.7",
         "commerceguys/addressing": "~1.0",
@@ -271,16 +271,20 @@
         "lvoogdt/leaflet-awesome-markers": "2.0.2",
         "fortawesome-mas/font-awesome": "4.7.0",
         "hubspot/pace": "0.7.5",
-        "drupal/markaspot": "dev-3.x"
+        "drupal/markaspot": "3.x-dev"
     },
     "require-dev": {
+        "drupal/drupal-extension": "^3.2",
         "behat/mink": "~1.7",
         "behat/mink-goutte-driver": "~1.2",
         "jcalderonzumba/gastonjs": "~1.0.2",
-        "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
+        "drupal/coder": "8.*",
         "mikey179/vfsStream": "~1.2",
         "phpunit/phpunit": "~4.8",
-        "symfony/css-selector": "~2.8"
+        "symfony/css-selector": "~2.8",
+        "behat/behat": "^3.0",
+        "se/selenium-server-standalone": "^2.53",
+        "composer/composer": "^1.3"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -290,40 +294,22 @@
         ]
     },
     "scripts": {
-        "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
-        "pre-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "pre-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
         "post-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
+            "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
         ],
         "post-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
+            "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
         ]
     },
-    "replace": {
-        "drupal/drupal": "*"
-    },
     "extra": {
-        "merge-plugin": {
-            "include": [
-                "composer.json",
-                "web/contrib/profiles/markaspot/composer.json"
-            ],
-            "recurse": true,
-            "merge-extra": true,
-            "merge-extra-deep": true
-        },
         "installer-paths": {
             "web/core": ["type:drupal-core"],
             "web/libraries/{$name}": ["type:drupal-library"],
             "web/modules/contrib/{$name}": ["type:drupal-module"],
             "web/profiles/contrib/{$name}": ["type:drupal-profile"],
             "web/themes/contrib/{$name}": ["type:drupal-theme"],
             "drush/contrib/{$name}": ["type:drupal-drush"]
-        }
+        },
+        "enable-patching": true
     }
 }