Skip to content

Commit

Permalink
Merge pull request #20 from automaticmagic/remove_ruby_2_2
Browse files Browse the repository at this point in the history
Remove support for Ruby 2.2
  • Loading branch information
macumber authored Jul 29, 2022
2 parents 53c20e3 + 5c5eb5c commit e2a0eef
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 34 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,22 @@ on:
pull_request:
branches:
- master

jobs:
test:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
ruby: [ '2.4', '2.5' ]
ruby: [ '2.5', '2.7', '3.0', '3.1' ]
name: Ruby ${{ matrix.ruby }} Tests
steps:
- name: Check out repository
uses: actions/checkout@v2
uses: actions/checkout@v2
- name: Set up Ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: default
- name: Run Tests
run: |
bundle update
Expand Down
2 changes: 1 addition & 1 deletion lib/topolys/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Topolys
VERSION = "0.5.2"
VERSION = "0.6.0"
end
1 change: 0 additions & 1 deletion spec/face_order_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'topolys'
require 'geometry_helpers'
require "json-schema"

RSpec.describe Topolys do

Expand Down
1 change: 0 additions & 1 deletion spec/faces_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'topolys'
require 'geometry_helpers'
require "json-schema"

RSpec.describe Topolys do

Expand Down
1 change: 0 additions & 1 deletion spec/holes_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'topolys'
require 'geometry_helpers'
require "json-schema"

RSpec.describe Topolys do

Expand Down
2 changes: 1 addition & 1 deletion spec/model_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'topolys'
require 'geometry_helpers'
require "json-schema"
require 'json-schema'

RSpec.describe Topolys do

Expand Down
1 change: 0 additions & 1 deletion spec/scrigno_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'topolys'
require 'geometry_helpers'
require "json-schema"

# test geometry for this model taken from https://github.com/rd2/tbd under MIT license
def scrigno_surfaces
Expand Down
1 change: 0 additions & 1 deletion spec/user_files_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'topolys'
require 'geometry_helpers'
require "json-schema"

RSpec.describe Topolys do

Expand Down
1 change: 0 additions & 1 deletion spec/wire_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'topolys'
require 'geometry_helpers'
require "json-schema"

RSpec.describe Topolys do

Expand Down
30 changes: 9 additions & 21 deletions topolys.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,13 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

if /^2.2/.match(RUBY_VERSION)
spec.required_ruby_version = "~> 2.2.0"

spec.add_development_dependency "public_suffix", "~> 3.1.1"
spec.add_development_dependency "json-schema", "~> 2.7.0"
spec.add_development_dependency "bundler", "~> 1.17.1"
spec.add_development_dependency "rake", "~> 12.3"
spec.add_development_dependency "rspec", "~> 3.7.0"
spec.add_development_dependency "rubocop", "~> 0.54.0"
spec.add_development_dependency "yard", "~> 0.9"
spec.add_development_dependency "parallel","~> 1.19.2"

else
spec.add_development_dependency "public_suffix", "~> 3.1.1"
spec.add_development_dependency "json-schema", "~> 2.7.0"
spec.add_development_dependency "bundler", "~> 2.1"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "rspec", "~> 3.9"
spec.add_development_dependency "rubocop", "~> 0.54.0"
spec.add_development_dependency "yard", "~> 0.9"
end
spec.required_ruby_version = ">= 2.5.0"

spec.add_runtime_dependency "matrix"

spec.add_development_dependency "json-schema", "~> 3.0"
spec.add_development_dependency "bundler", "~> 2.1"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "rspec", "~> 3.11"

end

0 comments on commit e2a0eef

Please sign in to comment.