Merge pull request #381 from rspec/update-travis-build-scripts-2019-07-24-for-master

Updates from rspec-dev (2019-07-24)

Author: JonRowe

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # In order to install old Rubies, we need to use old Ubuntu distibution.

Gemfile

@@ -20,14 +20,13 @@ if RUBY_VERSION < '2.0.0' || RUBY_ENGINE == 'java'
   gem 'json', '< 2.0.0' # is a dependency of simplecov
 end
 
-if RUBY_VERSION < '2.0.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
-  gem 'ffi', '< 1.9.15' # allow ffi to be installed on older rubies on windows
-elsif RUBY_VERSION < '1.9'
-  gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
+if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
+  gem 'ffi', '< 1.10'
 elsif RUBY_VERSION < '2.0'
-  gem 'ffi', '< 1.11.0' # ffi dropped Ruby 1.9 support in 1.11.0
+  # ffi dropped Ruby 1.8 support in 1.9.19 and Ruby 1.9 support in 1.11.0
+  gem 'ffi', '< 1.9.19'
 else
-  gem 'ffi', '~> 1.9.25'
+  gem 'ffi', '~> 1.11.0'
 end
 
 # No need to run rubocop on earlier versions

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 version: "{build}"
@@ -39,3 +39,4 @@ environment:
     - ruby_version: 23-x64
     - ruby_version: 24-x64
     - ruby_version: 25-x64
+    - ruby_version: 26-x64

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 function is_mri {

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/travis_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # Taken from:

script/update_rubygems_and_install_bundler

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-07-08T14:21:41+01:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:55+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e