diff --git a/.travis.yml b/.travis.yml
index 46a8cd0c87d30993f0aa54a55e16c33c6fb67cb9..62028fd43fb7b13010bdc2fdd047c990c4af3f54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ matrix:
env: AFATG=05-content-management
mysql:
- database: test_varbase807xxc
+ database: test_varbase808xxc
username: root
encoding: utf8
@@ -111,7 +111,7 @@ install:
## Install with drush.
- cd docroot
- - drush site-install varbase --yes --site-name='Test Varbase807xxc' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url="mysql://root:@localhost/test_varbase807xxc" varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_extra_components.varbase_blog=true varbase_extra_components.varbase_auth=true
+ - drush site-install varbase --yes --site-name='Test Varbase808xxc' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url="mysql://root:@localhost/test_varbase808xxc" varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_extra_components.varbase_blog=true varbase_extra_components.varbase_auth=true
- drush pm-enable varbase_development --yes
- drush pm-enable varbase_styleguide --yes
- drush pm-enable varbase_media_instagram --yes
diff --git a/README.md b/README.md
index c389f25d3ea4bdc5b0ed3cd777272c6ce5fd2bf2..735448c86c924bd63e5390d85e0032246d4929d0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](https://travis-ci.org/Vardot/varbase/builds/595754536) Varbase 8.7.2
+[](https://travis-ci.org/Vardot/varbase/builds/595754536) Varbase 8.8.x
[](https://www.drupal.org/project/varbase)
@@ -24,26 +24,19 @@ Installing Varbase 8.x-7.x comes with several extra automated installation
steps, to take full advantage of Varbase, other than the Drupal 8 installation
instructions.
-# Install with Composer
-
-To install the most recent stable release of Varbase 8.7.x run this command:
-```
-composer create-project vardot/varbase-project:^8.7.2 PROJECT_DIR_NAME --no-dev --no-interaction
-```
-
-To install the dev version of Varbase 8.7.x run this command:
+To install the dev version of Varbase 8.8.x run this command:
```
-composer create-project vardot/varbase-project:8.7.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
+composer create-project vardot/varbase-project:8.8.x-dev PROJECT_DIR_NAME --stability dev --no-interaction
```
-## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/8.x-7.x/scripts/README.md)
+## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/8.x-8.x/scripts/README.md)
-## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/8.x-7.x/tests/README.md)
+## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/8.x-8.x/tests/README.md)
-## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/8.x-7.x/tests/features/varbase/README.md)
+## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/8.x-8.x/tests/features/varbase/README.md)
-## [Varbase 8.7.x Developer Guide](https://docs.varbase.vardot.com)
+## [Varbase 8.8.x Developer Guide](https://docs.varbase.vardot.com)
-## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/8.x-7.x/CHANGELOG.md)
+## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/8.x-8.x/CHANGELOG.md)
-## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/8.x-7.x/UPDATE.md)
+## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/8.x-8.x/UPDATE.md)
diff --git a/UPDATE.md b/UPDATE.md
index c4f6669d0d06a06cc074b91aa0b4e9b95fb4fbbe..7e1817f7a1adb71f5fde38c753bfec6e991b4bab 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -64,13 +64,13 @@ At the end of the update process, two log files are useful to troubleshoot
2. Edit your _composer.json_ file to be ready for updates. You have two choices.
1. **The hard way:** Edit your _composer.json_ to include
all the new updates made in
- [varbase-project](https://github.com/Vardot/varbase-project/blob/8.7.x/composer.json).
+ [varbase-project](https://github.com/Vardot/varbase-project/blob/8.8.x/composer.json).
This includes the new components required and its versions
_"require"_, _"repositories"_, _"extra"_, and any other important config.
You can use a diff tool such as [Meld](http://meldmerge.org/) or
[DiffMerge](https://sourcegear.com/diffmerge/) to help you diff between
your old _composer.json_ and the new one from
- [varbase-project](https://github.com/Vardot/varbase-project/blob/8.7.x/composer.json).
+ [varbase-project](https://github.com/Vardot/varbase-project/blob/8.8.x/composer.json).
2. **The easy way:**
1. If you're using Varbase 8.6.2 or older, install
[varbase-updater](https://github.com/Vardot/varbase-updater) through Composer.
diff --git a/build-varbase.make b/build-varbase.make
index 16d8a6be1c8274d739b80f8e1ca8a9673f44945a..7ba261800ac33970b535b87cbda1f2ef61f78f54 100644
--- a/build-varbase.make
+++ b/build-varbase.make
@@ -4,4 +4,4 @@ includes[] = drupal-org-core.make
projects[varbase][type] = profile
projects[varbase][download][type] = git
-projects[varbase][download][branch] = 8.x-7.x
+projects[varbase][download][branch] = 8.x-8.x
diff --git a/build.xml b/build.xml
index c921d226392d2f82f6fd52d3b918977e71405db9..b497e3d03ca503090e5d5a1b58ba9fb8c1d446d1 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
<property name="db.host" value="localhost" />
<property name="db.user" value="root" />
<property name="db.password" value="" />
- <property name="db.database" value="test_varbase807xxc" />
+ <property name="db.database" value="test_varbase808xxc" />
<property name="db.url" value="${db.type}://${db.user}:${db.password}@${db.host}/${db.database}" />
<property name="docroot" value="docroot" />
<property name="profile" value="${docroot}/profiles/varbase" />
@@ -90,7 +90,7 @@
<!-- Install with drush site install -->
<target name="install-with-drush-site-install" depends="env">
<!-- Use passthru() when executing drush site-install so that we'll know if errors occur. -->
- <exec command="${drush} site-install varbase --yes --site-name='Test Varbase807xxc' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=${db.url} varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_extra_components.varbase_blog=true varbase_extra_components.varbase_auth=true varbase_development_tools.varbase_development=true" dir="${docroot}" passthru="true" />
+ <exec command="${drush} site-install varbase --yes --site-name='Test Varbase808xxc' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=${db.url} varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_extra_components.varbase_blog=true varbase_extra_components.varbase_auth=true varbase_development_tools.varbase_development=true" dir="${docroot}" passthru="true" />
<exec command="${drush} en varbase_styleguide --yes" dir="${docroot}" />
<exec command="${drush} en vbp_text_and_image --yes" dir="${docroot}" />
<exec command="${drush} en varbase_media_instagram --yes" dir="${docroot}" />
diff --git a/composer.json b/composer.json
index 1babc76c1797fa5196fe9985d161047efcff3f10..56ee9a826b4faba6b0d897b883cf01d90b88401f 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
"cweagans/composer-patches": "~1.0",
"drupal-composer/drupal-scaffold": "~2.0",
"drupal/drupal-library-installer-plugin": "^0.3",
- "drupal/varbase_core": "7.x-dev",
+ "drupal/varbase_core": "8.x-dev",
"drupal/varbase_api": "7.x-dev",
"drupal/varbase_media": "7.x-dev",
"drupal/varbase_bootstrap_paragraphs": "7.x-dev",
@@ -98,7 +98,7 @@
},
"extra": {
"branch-alias": {
- "dev-8.x-7.x": "8.7.x-dev"
+ "dev-8.x-8.x": "8.8.x-dev"
},
"installer-types": [
"bower-asset",
diff --git a/drupal-org-core.make b/drupal-org-core.make
index 94b14dd9d920b1206b4f281afb1fd166c348417f..4ffcb4f1fed7c55991cc580e12b4925cab197ad4 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -3,13 +3,13 @@ core = 8.x
; Drupal Core
projects[drupal][type] = "core"
-projects[drupal][version] = "8.7.8"
+projects[drupal][version] = "8.0.0-beta1"
;; Issue #2869592: Disabled update module shouldn't produce a status report warning
projects[drupal][patch][] = https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch
;; Issue #2815221: Add quickedit to the latest-revision route
projects[drupal][patch][] = https://www.drupal.org/files/issues/2019-03-05/2815221-116.patch
;; Issue #1356276: Allow profiles to define a base/parent profile and load them in the correct order
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-10-12/1356276-531.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2019-11-05/1356276-531-8.8.x-4.patch
;; Issue #2914389: Allow profiles to exclude dependencies of their parent
projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-09/2914389-8-do-not-test.patch
;; Issue #2893892: Fixed Warning Invalid argument supplied for foreach() in Drupal
diff --git a/drupal-org.make b/drupal-org.make
index e41368dc4e9cc0040047308daa42392c3e6224bd..8857ebad467308dbd4489601a5751811e2d2a587 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -504,7 +504,7 @@ projects[total_control][version] = 2.0-beta2
;;;;;;;;;;;;;;;;;;;;;
projects[varbase_core][type] = module
-projects[varbase_core][version] = 7.x-dev
+projects[varbase_core][version] = 8.x-dev
projects[varbase_api][type] = module
projects[varbase_api][version] = 7.x-dev
diff --git a/package.json b/package.json
index d11d8f251c12492c7a412190574371477dff2c8a..0d5deb462ba97ab88b6d8908a11dd413b47bd473 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "varbase",
"private": true,
- "version": "8.7.0",
+ "version": "8.8.0",
"description": "Varbase: The Ultimate Drupal 8 CMS Starter Kit (Bootstrap Ready)",
"keywords": [
"Drupal",
diff --git a/varbase.info.yml b/varbase.info.yml
index b57b9e947a5fa6c1f450a515a42d3fb84170b030..b8f12233beb5f6a3844a54d4f6449630ff807c63 100755
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -7,7 +7,7 @@ distribution:
name: Varbase
install:
theme: vartheme_admin
-version: 8.x-7.x-dev
+version: 8.x-8.x-dev
install:
- system
- action