From 0680b75695e37b19cf0c8940a5bcf0fc3df97eb8 Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 8 Feb 2017 21:52:18 +0200
Subject: [PATCH] Development branch is now 8.4.x

---
 .gitignore       | 1 +
 app/bin/build.sh | 4 ++--
 app/bin/json.rb  | 2 +-
 gulpfile.js      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 55691236c9..b356047117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ pip-log.txt
 cores.db
 app/data/company_infos.yml
 app/data/company_mapping.yml
+app/drupalcore
 tmp/
diff --git a/app/bin/build.sh b/app/bin/build.sh
index 8e397e1f16..26b06ab2c1 100755
--- a/app/bin/build.sh
+++ b/app/bin/build.sh
@@ -5,10 +5,10 @@ git pull
 echo "Updating Sub Repos"
 
 if [ ! -d "./app/drupalcore" ]; then
-  git clone --branch 8.3.x http://git.drupal.org/project/drupal.git ./app/drupalcore
+  git clone --branch 8.4.x http://git.drupal.org/project/drupal.git ./app/drupalcore
 else
   cd ./app/drupalcore
-  git checkout 8.3.x
+  git checkout 8.4.x
   git pull
   cd ../bin
 fi
diff --git a/app/bin/json.rb b/app/bin/json.rb
index a465a222df..1d5feea38d 100755
--- a/app/bin/json.rb
+++ b/app/bin/json.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 log_args = ARGV[0] || '--since=2011-03-09'
-git_command = 'git --git-dir=../drupalcore/.git --work-tree=drupal log 8.3.x ' + log_args + ' -s --format=%s'
+git_command = 'git --git-dir=../drupalcore/.git --work-tree=drupal log 8.4.x ' + log_args + ' -s --format=%s'
 
 Encoding.default_external = Encoding::UTF_8
 require 'erb'
diff --git a/gulpfile.js b/gulpfile.js
index 8ad41b053f..6361381342 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -38,7 +38,7 @@ gulp.task('drupalcore', function () {
   var fs = require('fs');
 
   return gulp.src('')
-    .pipe(gulpif(!fs.existsSync(paths.drupal), shell(['git clone --branch 8.3.x http://git.drupal.org/project/drupal.git ' + paths.drupal])))
+    .pipe(gulpif(!fs.existsSync(paths.drupal), shell(['git clone --branch 8.4.x http://git.drupal.org/project/drupal.git ' + paths.drupal])))
     .pipe(shell(['git pull'],{ 'ignoreErrors': true, 'cwd': './app/drupalcore'}));
 });