diff --git a/.ruby-version b/.ruby-version index a9eea9a34..d7edb5686 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.3.8 +ruby-2.6.5 diff --git a/Dockerfile b/Dockerfile index 04e5c8428..a6119a10b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.3.8-alpine +FROM ruby:2.6.5-alpine MAINTAINER peng@sleede.com # Install upgrade system packages diff --git a/Gemfile b/Gemfile index a88aec5c8..0d0268f9a 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'sass-rails', '~> 5.0', '>= 5.0.6' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 4.1.20' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -gem 'therubyracer', '= 0.12.0', platforms: :ruby +gem 'therubyracer', '= 0.12.3', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 9726ec897..42eb02d7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -419,8 +419,8 @@ GEM ffi term-ansicolor (1.7.1) tins (~> 1.0) - therubyracer (0.12.0) - libv8 (~> 3.16.14.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref thor (1.0.1) thread_safe (0.3.6) @@ -534,11 +534,11 @@ DEPENDENCIES spring-watcher-listen (~> 2.0.0) stripe (= 5.1.1) sys-filesystem - therubyracer (= 0.12.0) + therubyracer (= 0.12.3) uglifier (>= 4.1.20) vcr (= 3.0.1) web-console (>= 3.3.0) webmock BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/README.md b/README.md index 01a4d8e53..29fb01742 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ Before reporting an issue, please check if your issue is not listed in the [know ## Related Documentation -- [Ruby 2.3.0](http://ruby-doc.org/core-2.3.0/) +- [Ruby 2.6.5](http://ruby-doc.org/core-2.6.5/) - [Ruby on Rails](http://api.rubyonrails.org) - [AngularJS](https://docs.angularjs.org/api) - [Angular-Bootstrap](http://angular-ui.github.io/bootstrap/) diff --git a/doc/development_readme.md b/doc/development_readme.md index 23839225d..7a681f880 100644 --- a/doc/development_readme.md +++ b/doc/development_readme.md @@ -93,7 +93,7 @@ This procedure is not easy to follow so if you don't need to write some code for 10. Install bundler in the current RVM gemset ```bash - gem install bundler --version=1.17.3 + gem install bundler ``` 11. Install the required ruby gems and javascript plugins diff --git a/provision/box_setup.zsh b/provision/box_setup.zsh index a266beefb..491e2598b 100755 --- a/provision/box_setup.zsh +++ b/provision/box_setup.zsh @@ -157,11 +157,11 @@ install_rvm() { install_ruby() { echo 'Installing Ruby' sudo apt-get install -y libxml2-dev libxslt1-dev libpq-dev libidn11-dev - rvm install ruby-2.3.8 - rvm use ruby-2.3.8@global + rvm install ruby-2.6.5 + rvm use ruby-2.6.5@global gem update --system --no-doc gem update --no-doc - rvm use ruby-2.3.8 --default + rvm use ruby-2.6.5 --default rvm cleanup all }