From 7e3c601a251f36f7cf18200754472c940aedb178 Mon Sep 17 00:00:00 2001
From: Patrick Gansterer <paroga@paroga.com>
Date: Mon, 23 Mar 2020 15:39:06 +0100
Subject: [PATCH] Update Ruby version to 2.6.6

---
 .ruby-version            | 2 +-
 .travis.yml              | 3 ++-
 Dockerfile               | 2 +-
 Dockerfile-dev           | 2 +-
 doc/SETUP_DEVELOPMENT.md | 6 +++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 7bf4b6a8..338a5b5d 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.4.6
+2.6.6
diff --git a/.travis.yml b/.travis.yml
index c44bb8e2..13219bed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: ruby
+dist: bionic
 sudo: false
 rvm:
-  - 2.4
+  - 2.6
 services:
   - mysql
   - redis-server
diff --git a/Dockerfile b/Dockerfile
index f02998c5..bff2272c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4
+FROM ruby:2.6
 
 RUN supercronicUrl=https://github.com/aptible/supercronic/releases/download/v0.1.3/supercronic-linux-amd64 && \
     supercronicBin=/usr/local/bin/supercronic && \
diff --git a/Dockerfile-dev b/Dockerfile-dev
index d07ad3ee..a8f9b489 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM ruby:2.4
+FROM ruby:2.6
 
 # Install dependencies
 RUN deps='libmagic-dev chromium' && \
diff --git a/doc/SETUP_DEVELOPMENT.md b/doc/SETUP_DEVELOPMENT.md
index c877f5df..51a4e3c2 100644
--- a/doc/SETUP_DEVELOPMENT.md
+++ b/doc/SETUP_DEVELOPMENT.md
@@ -34,13 +34,13 @@ If instead you just want to run Foodsoft without changing its code, please refer
    [Docker Development Setup](./SETUP_DEVELOPMENT_DOCKER.md#prerequisites-windows-only)
    instructions.
 
-1. Install RVM and Ruby 2.4+ (if you have not done so before):
+1. Install RVM and Ruby 2.6+ (if you have not done so before):
 
         \curl -L https://get.rvm.io | bash
         source ~/.rvm/scripts/rvm
-        rvm install 2.4
+        rvm install 2.6
 
-    We try to keep Foodsoft compatible with Ruby 2.4 as well as any later versions,
+    We try to keep Foodsoft compatible with Ruby 2.6 as well as any later versions,
     so if you use this and don't want to use RVM, that might actually work.
 
 2. Install system dependencies.