Merge branch 'release/4.0.0'

.github_changelog_generator

@@ -5,6 +5,6 @@ user=acquia
 project=drupal-spec-tool
 unreleased=true
 exclude-labels=dependencies,duplicate,question,invalid,wontfix,Duplicate,Question,Invalid,Wontfix,Meta: Exclude From Changelog
-future-release=v3.0.1
+future-release=4.0.0
 release-branch=develop
 output=docs/CHANGELOG.md

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: php
 
-php: "7.2"
+php: "7.3"
 
 addons:
   chrome: stable
@@ -30,12 +30,7 @@ matrix:
   include:
     # Standard ORCA jobs.
     - { name: "Static code analysis", env: ORCA_JOB=STATIC_CODE_ANALYSIS }
-    - { name: "Isolated test w/ recommended package versions", env: ORCA_JOB=ISOLATED_RECOMMENDED }
-    - { name: "Integrated test w/ recommended package versions", env: ORCA_JOB=INTEGRATED_RECOMMENDED }
-    - { name: "Integrated test w/ recommended package versions & previous minor release of Drupal core", env: ORCA_JOB=CORE_PREVIOUS }
-    - { name: "Isolated test w/ dev package versions", env: ORCA_JOB=ISOLATED_DEV }
-    - { name: "Integrated test w/ dev package versions", env: ORCA_JOB=INTEGRATED_DEV }
-    - { name: "Integrated test w/ dev package versions & next minor dev version of Drupal core", env: ORCA_JOB=CORE_NEXT }
+    - { name: "D9 readiness test", env: ORCA_JOB=D9_READINESS}
     # Custom job.
     - { name: "Lightning/Spreadsheet/Behat integration test", env: BEHAT=TRUE ORCA_PACKAGES_CONFIG=../drupal-spec-tool/config/packages.yml }
   allow_failures:

bin/travis/install.sh

@@ -15,10 +15,10 @@ cd "$(dirname "$0")" || exit 1; source _includes.sh
 [[ ! "$BEHAT" == "TRUE" ]] && exit
 
 # Create the fixture.
-orca fixture:init -f --sut=acquia/drupal-spec-tool --profile=lightning
+orca fixture:init -f --sut=acquia/drupal-spec-tool --core=~9 --profile=lightning --project-template=acquia/drupal-recommended-project
 
 cd "$ORCA_FIXTURE_DIR" || exit 1
 
-# Remove conflicting package and add Behat.
-composer remove --dev acquia/blt-require-dev
-composer require behat/behat
+# Delete some Lightning Behat files that cause errors and invalid test failures.
+# @todo Coordinate with the Lighthning team to fix this upstream.
+find docroot/modules/contrib/lightning_* -name \*.behat.inc -exec rm -rf {} \;

composer.json

@@ -15,8 +15,8 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
-        "drupal/core": "^8.7.0",
+        "php": "^7.3",
+        "drupal/core": "^9.0",
         "drupal/drupal-extension": "^3.4 || ^4.0",
         "traviscarden/behat-table-comparison": "^0.2.1"
     },
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "v3.x-dev"
+            "dev-develop": "4.x-dev"
         }
     },
     "autoload": {

config/packages.yml

@@ -4,8 +4,8 @@ acquia/drupal-spec-tool:
 
 acquia/lightning:
   type: drupal-profile
-  version: 4.x
-  version_dev: 4.x-dev
+  version: 5.x
+  version_dev: 5.x-dev
 
 # Let Lightning manage its own components.
 drupal/lightning_api: ~

docs/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## [v3.0.1](https://github.com/acquia/drupal-spec-tool/tree/v3.0.1) (2020-06-22)
+## [4.0.0](https://github.com/acquia/drupal-spec-tool/tree/4.0.0) (2020-06-24)
+
+[Full Changelog](https://github.com/acquia/drupal-spec-tool/compare/v3.0.1...4.0.0)
+
+**Implemented enhancements:**
+
+- Create new version for Drupal 9 [\#44](https://github.com/acquia/drupal-spec-tool/issues/44)
+
+## [v3.0.1](https://github.com/acquia/drupal-spec-tool/tree/v3.0.1) (2020-06-23)
 
 [Full Changelog](https://github.com/acquia/drupal-spec-tool/compare/v3.0.0...v3.0.1)
 

docs/README.md

@@ -8,7 +8,10 @@ This project provides a tool for specifying Drupal architecture details and gene
 
 ### Google sheet
 
-Copy [the current version of the Google sheet](https://docs.google.com/spreadsheets/d/1FC2HSsumZUMOr83rq8mmI8g9l8g_peI_pEBnc79-Rks/edit?usp=sharing) to your Google Drive.
+Copy the appropriate version of the Google sheet to your Google Drive:
+
+- [Google sheet for Drupal 9](https://docs.google.com/spreadsheets/d/1bp2-HFNThXbPYEWjPhQZWCQ31OUd68gdNrY_h20rKqA/edit?usp=sharing)
+- [Google sheet for Drupal 8](https://docs.google.com/spreadsheets/d/1FC2HSsumZUMOr83rq8mmI8g9l8g_peI_pEBnc79-Rks/edit?usp=sharing)
 
 ![Google Sheet Screenshot](images/screenshot.png)
 

docs/RELEASING.md

@@ -10,16 +10,17 @@ For project maintainers.
 1. For a new major version, update `extra.branch-alias.dev-develop` in [composer.json](../composer.json).
 1. In the [canonical (master) version of the spreadsheet](https://docs.google.com/spreadsheets/d/1GDNEzJe_rWdM3oG_kbBEH8r11Pcy4a1xJ1oglVBsZRE/edit)...
     1. Update the version number on the "Overview" tab next to "Based on the document template version:" to the new release version number.
-    1. [Name the current version](https://support.google.com/docs/answer/190843) of the document the new release version number.
     1. [Make a copy](https://support.google.com/docs/answer/49114) of the document and...
         1. Name it "Drupal Spec Tool $VERSION (current)", e.g., "Drupal Spec Tool v2.0.0 (current)".
         1. Share it with the same people.
 1. In the new document, [get a shareable link](https://support.google.com/docs/answer/2494822) for use in the following steps.
 1. Update the link to "the current version of the Google sheet" in the [README](README.md).
 1. Send the document ID from the new link to the Acquia Professional Services, Operations team to update the Project Template.
-1. In [.github_changelog_generator](.github_changelog_generator), set the value of `future-release` to the new release version number.
+1. Update [the document overview screenshot](images/screenshot.png).
+1. In [.github_changelog_generator](../.github_changelog_generator), set the value of `future-release` to the new release version number.
 1. Run `github_changelog_generator` from the root directory.
-1. Commit code changes and push to GitHub.
+1. Cut a release using [Gitflow](https://github.com/nvie/gitflow).
+1. Push the release to GitHub along with the updated `develop` and `master` branches.
 1. [Create a release](https://help.github.com/articles/creating-releases/) on GitHub and...
     1. Set the tag version and release title both to the new release version number.
     1. Use the following template for the description. See [v2.0.0](https://github.com/acquia/drupal-spec-tool/releases/tag/v2.0.0) for an example.
@@ -29,3 +30,4 @@ For project maintainers.
         $VERSION_DETAILS_FROM_CHANGELOG_DOT_MD
         ```
 1. Confirm that the [Packagist package](https://packagist.org/packages/acquia/drupal-spec-tool) detects the new version.
+1. Notify users as appropriate.