From f38e6c7bf173c24ed7944c04d7cce47d9bce900e Mon Sep 17 00:00:00 2001
From: Pille <pille@discolabs.com>
Date: Wed, 15 Apr 2020 09:07:07 +0800
Subject: [PATCH] Bump version

---
 CHANGELOG.md             | 11 +++++++++++
 UPGRADING.md             | 16 ++++++++++++++++
 VERSION                  |  2 +-
 initialise.sh            |  2 +-
 lib/disco_app/version.rb |  2 +-
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 768f7868..8acf015b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 0.18.0 - 2020-04-15
+### Changed
+- Upgraded to Rails 6
+- Upgraded to Ruby 2.6.5
+- Upgraded to shopify_api 9
+- Upgraded to shopify_app 12
+- Upgraded to sidekiq 6
+- Replaced .ruby-version with .tool-versions
+- Updated Timber initialiser
+- Updated README
+
 ## 0.17.0 - 2019-07-16
 ### Added
 - Timber logging for generated apps
diff --git a/UPGRADING.md b/UPGRADING.md
index d6dc37b8..c2c96699 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -3,6 +3,22 @@ This file contains more detailed instructions on what's required when updating
 an application between one release version of the gem to the next. It's intended
 as more in-depth accompaniment to the notes in `CHANGELOG.md` for each version.
 
+## Upgrading from 0.17.0 to 0.18.0
+Upgrade to Rails 6 ([guide](https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-5-2-to-rails-6-0)).
+
+Upgrade to Ruby 2.6.5.
+
+Upgrade the following gems:
+```
+gem 'shopify_api', '~> 9.0'
+gem 'shopify_app', '~> 12.0.7'
+gem 'sidekiq', '~> 6.0'
+```
+
+Additionally, you might have to upgrade `react-rails`, `uglifier`, `vcr` and `webmock` gems.
+
+Add `SHOPIFY_APP_API_VERSION` env variable.
+
 ## Upgrading from 0.16.1 to 0.17.1
 Upgrade your app to Rails version 5.2.2.
 
diff --git a/VERSION b/VERSION
index c5523bd0..66333910 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.17.0
+0.18.0
diff --git a/initialise.sh b/initialise.sh
index 6d88ea99..2d42b99e 100755
--- a/initialise.sh
+++ b/initialise.sh
@@ -4,7 +4,7 @@
 APP_NAME="$1"
 RAILS_VERSION="${RAILS_VERSION:-6.0.1}"
 RUBY_VERSION="${RUBY_VERSION:-2.6.5}"
-DISCO_APP_VERSION="${DISCO_APP_VERSION:-0.17.0}"
+DISCO_APP_VERSION="${DISCO_APP_VERSION:-0.18.0}"
 
 if [ -z $APP_NAME ]; then
   echo "Usage: ./initialise.sh app_name (rails_version) (ruby_version) (disco_app_version)"
diff --git a/lib/disco_app/version.rb b/lib/disco_app/version.rb
index d0a19251..bc3c7b21 100644
--- a/lib/disco_app/version.rb
+++ b/lib/disco_app/version.rb
@@ -1,5 +1,5 @@
 module DiscoApp
 
-  VERSION = '0.17.0'.freeze
+  VERSION = '0.18.0'.freeze
 
 end