Prepare for 8.6.0 (#601)

.travis.yml

@@ -11,7 +11,7 @@ php:
   - 7.0
 env:
   - VERSION=HEAD
-  - VERSION=3.1.7
+  - VERSION=3.2.0-beta1
   # The final CI slot should be used to test the update path from the oldest
   # available database fixture.
   - VERSION=3.0.0

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.2.0
+* Drupal core has been updated to 8.6.0.
+* The `lightning:subprofile` command is no longer compatible with the
+  sub-profile system from Drupal 8.5.x. The `dependencies` list is replaced by
+  `install`, `base profile` is the name of the base profile instead of an
+  array, and all excluded modules and themes are listed in a single `exclude`
+  array. (#585)
+
 ## 3.1.7
 * Lightning API has been updated to 2.7, which fixes a persistent warning that
   could occur as a result of the OpenAPI module's beta2 update.

UPDATE.md

@@ -170,6 +170,30 @@ are currently running 2.2.0 and are trying to update to 2.2.6, you will need to
 follow the instructions for updating from 2.2.0 to 2.2.1, then from 2.2.1 to
 2.2.2, in that order.
 
+### 3.1.7 to 3.2.0-beta1
+* If you have any sub-profiles (regardless of whether or not they extend
+  Lightning), you must change their info files to work with Drupal 8.6.0:
+  * Change `base profile` to a string, containing the name of the base
+    profile. For example: `base profile: lightning`.
+  * Change the `dependencies` key to `install`.
+  * If you have any excluded dependencies or themes, merge them into a
+    single array, with the key `exclude`.
+  For example, an 8.6.0-compatible sub-profile info file will look something
+  like this:
+```
+name: My Profile
+core: 8.x
+type: profile
+base profile: lightning
+install:
+  - paragraphs
+  - slick_entityreference
+exclude:
+  - lightning_search
+  - pathauto
+  - bartik
+```
+
 ### 3.1.6 to 3.1.7
 * There are no manual update steps for this version.
 

composer.json

@@ -88,10 +88,10 @@
     "require": {
         "cweagans/composer-patches": "^1.6.4",
         "drupal/lightning_api": "2.x-dev",
-        "drupal/lightning_core": "2.x-dev",
+        "drupal/lightning_core": "3.x-dev",
         "drupal/lightning_layout": "1.x-dev",
-        "drupal/lightning_media": "2.x-dev",
-        "drupal/lightning_workflow": "2.x-dev",
+        "drupal/lightning_media": "3.x-dev",
+        "drupal/lightning_workflow": "3.x-dev",
         "drupal-composer/drupal-scaffold": "^2.0.0",
         "oomphinc/composer-installers-extender": "^1.1"
     },

drupal-org-core.make

@@ -3,14 +3,9 @@ api = 2
 projects[drupal][type] = core
 projects[drupal][download][type] = git
 projects[drupal][download][url] = https://git.drupal.org/project/drupal.git
-projects[drupal][download][branch] = 8.5.x
-projects[drupal][download][tag] = 8.5.6
-projects[drupal][patch][] = https://www.drupal.org/files/issues/1356278-408--8.5.x-real.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2880374-remove-experimental-warnings-6.patch
+projects[drupal][download][branch] = 8.6.x
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2885441-2.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-06-07/2815221-102.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-04/2921661-86-8.6.x.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2877383-56.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2670730-81-89-8.5.0-rc1.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-08-22/off-canvas-2945571-19.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-09/2815221-105.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-12/1356276-473.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-09/2914389-8-do-not-test.patch

drupal-org.make

@@ -33,15 +33,30 @@ projects[inline_entity_form][version] = 1.0-rc1
 projects[jsonapi][type] = module
 projects[jsonapi][version] = 1.23
 projects[lightning_api][type] = module
-projects[lightning_api][version] = 2.7
+projects[lightning_api][download][type] = git
+projects[lightning_api][download][url] = https://git.drupal.org/project/lightning_api
+projects[lightning_api][download][branch] = 2.x
+projects[lightning_api][download][revision] = e7df70ae662305605b06ba73aad9d8e2bc6d0f83
 projects[lightning_core][type] = module
-projects[lightning_core][version] = 2.9
+projects[lightning_core][download][type] = git
+projects[lightning_core][download][url] = https://git.drupal.org/project/lightning_core
+projects[lightning_core][download][branch] = 3.x
+projects[lightning_core][download][revision] = acd3f6bd16caba7fc8daefd41bdb66ca42e19255
 projects[lightning_layout][type] = module
-projects[lightning_layout][version] = 1.4
+projects[lightning_layout][download][type] = git
+projects[lightning_layout][download][url] = https://git.drupal.org/project/lightning_layout
+projects[lightning_layout][download][branch] = 1.x
+projects[lightning_layout][download][revision] = f16a2fa0be8f15c8577485d0f1814a8b8c27d791
 projects[lightning_media][type] = module
-projects[lightning_media][version] = 2.4
+projects[lightning_media][download][type] = git
+projects[lightning_media][download][url] = https://git.drupal.org/project/lightning_media
+projects[lightning_media][download][branch] = 3.x
+projects[lightning_media][download][revision] = 053a51f879d6d7c871102205576b298a4da6fab2
 projects[lightning_workflow][type] = module
-projects[lightning_workflow][version] = 2.4
+projects[lightning_workflow][download][type] = git
+projects[lightning_workflow][download][url] = https://git.drupal.org/project/lightning_workflow
+projects[lightning_workflow][download][branch] = 3.x
+projects[lightning_workflow][download][revision] = a52e2a848b4fd8c139ef58f18c9fc3203dac6b85
 projects[media_entity_instagram][type] = module
 projects[media_entity_instagram][patch][] = https://www.drupal.org/files/issues/2917454-2.patch
 projects[media_entity_instagram][version] = 2.0-alpha1

lightning.info.yml

@@ -5,7 +5,7 @@ description: 'A fast and feature-rich Drupal distribution.'
 version: '8.x-3.x-dev'
 distribution:
   name: Lightning
-dependencies:
+install:
   - block_content
   - breakpoint
   - ckeditor
@@ -61,4 +61,4 @@ themes:
   - bartik
   - seven
 project: lightning
-datestamp: '1535742343'
+datestamp: '1533732973'