From 2029fe261d6efbb269a0958886056ecc4d034a15 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <michael.nikitochkin@shopify.com>
Date: Tue, 24 Aug 2021 08:48:08 +0200
Subject: [PATCH] Upgrade Golang and Ruby versions

Use latest versions of the programming languages.
---
 .gitignore   |  1 +
 .travis.yml  |  9 +++++----
 Gemfile.lock | 36 ++++++++++++++++--------------------
 dev.yml      |  4 ++--
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb390eaf1..dde19b8f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ cover*.out
 coverage.html
 *.deb
 tmp/
+.bundle/
diff --git a/.travis.yml b/.travis.yml
index 3499e87c1..ccee74801 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,15 +14,16 @@ env:
 matrix:
   fast_finish: true
   include:
-    - go: 1.11.x
-    - go: 1.12.x
+    - go: 1.14.x
+    - go: 1.15.x
+    - go: 1.16.x
     - go: tip
   allow_failures:
     - go: tip
 
 before_script:
-  - go mod download 
+  - go mod download
 
 script:
-  - go test ./...  
+  - go test ./...
   - go test -race ./...
diff --git a/Gemfile.lock b/Gemfile.lock
index ca47418d7..052ed3c9b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,47 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    arr-pm (0.0.10)
+    arr-pm (0.0.11)
       cabin (> 0)
-    backports (3.15.0)
+    backports (3.21.0)
     cabin (0.9.0)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
     clamp (1.0.1)
-    dotenv (2.7.2)
-    ffi (1.11.1)
-    fpm (1.11.0)
-      arr-pm (~> 0.0.10)
+    dotenv (2.7.6)
+    fpm (1.13.1)
+      arr-pm (~> 0.0.11)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
-      childprocess (= 0.9.0)
       clamp (~> 1.0.0)
-      ffi
-      json (>= 1.7.7, < 2.0)
+      git (>= 1.3.0, < 2.0)
+      json (>= 1.7.7, < 3.0)
       pleaserun (~> 0.0.29)
-      ruby-xz (~> 0.2.3)
+      rexml
       stud
+    git (1.9.1)
+      rchardet (~> 1.8)
     insist (1.0.0)
-    io-like (0.3.0)
-    json (1.8.6)
+    json (2.5.1)
     mustache (0.99.8)
-    pleaserun (0.0.30)
+    pleaserun (0.0.32)
       cabin (> 0)
       clamp
       dotenv
       insist
       mustache (= 0.99.8)
       stud
-    ruby-xz (0.2.3)
-      ffi (~> 1.9)
-      io-like (~> 0.3)
+    rchardet (1.8.0)
+    rexml (3.2.5)
     stud (0.0.23)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   fpm
 
 BUNDLED WITH
-   2.2.22
+   2.2.26
diff --git a/dev.yml b/dev.yml
index 7c61df360..6edc17792 100644
--- a/dev.yml
+++ b/dev.yml
@@ -6,9 +6,9 @@ up:
   - homebrew:
     - gnu-tar
   - go:
-      version: 1.12
+      version: 1.16
       modules: true
-  - ruby: 2.6.3
+  - ruby: 3.0.2
   - bundler
 
 commands: