From 89d23a5c5c2e9b48c72e0f05c04747691d9f8afe Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Thu, 27 Apr 2023 13:32:34 +0200 Subject: Bump required ruby version to 2.5 And remove support for older rubies. --- .github/workflows/ci.yml | 4 +--- ffi.gemspec | 2 +- spec/ffi/rbx/memory_pointer_spec.rb | 10 ++++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58fdbd0..b9e87d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,12 +42,10 @@ jobs: fail-fast: false matrix: os: [ ubuntu, macos, windows ] - ruby: [ 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2, ruby-head, truffleruby-head, jruby-head ] + ruby: [ 2.5, 2.6, 2.7, '3.0', 3.1, 3.2, ruby-head, truffleruby-head, jruby-head ] exclude: - os: windows ruby: truffleruby-head - - os: windows - ruby: 2.3 # compilation fails runs-on: ${{ matrix.os }}-latest steps: - uses: actions/checkout@v2 diff --git a/ffi.gemspec b/ffi.gemspec index 0e9d86a..71b5931 100644 --- a/ffi.gemspec +++ b/ffi.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |s| s.rdoc_options = %w[--exclude=ext/ffi_c/.*\.o$ --exclude=ffi_c\.(bundle|so)$] s.license = 'BSD-3-Clause' s.require_paths << 'ext/ffi_c' - s.required_ruby_version = '>= 2.3' + s.required_ruby_version = '>= 2.5' s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rake-compiler', '~> 1.1' s.add_development_dependency 'rake-compiler-dock', '~> 1.0' diff --git a/spec/ffi/rbx/memory_pointer_spec.rb b/spec/ffi/rbx/memory_pointer_spec.rb index 83d77c3..1270c9b 100644 --- a/spec/ffi/rbx/memory_pointer_spec.rb +++ b/spec/ffi/rbx/memory_pointer_spec.rb @@ -110,12 +110,10 @@ describe "MemoryPointer" do end it "allows overwriting of a default typedef" do - begin - FFI.typedef :uint32, :char - expect(FFI.find_type(:char)).to eq(FFI::Type::Builtin::UINT32) - ensure - FFI.typedef FFI::Type::Builtin::CHAR, :char - end + FFI.typedef :uint32, :char + expect(FFI.find_type(:char)).to eq(FFI::Type::Builtin::UINT32) + ensure + FFI.typedef FFI::Type::Builtin::CHAR, :char end it "allows writing a custom typedef" do -- cgit v1.2.1