Skip to content

Commit

Permalink
Remove reliance on ActiveSupport (#222)
Browse files Browse the repository at this point in the history
* only test Ruby 2.6

* fix require

* modernize gemspec

* remove ActiveSupport requirement as it's not actually required
  • Loading branch information
igor-makarov authored May 9, 2021
1 parent 66486c8 commit ad64ee2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-10.15]
ruby: [2.3.3, 2.4, 2.5, 2.6, 2.7]
ruby: [2.6, 2.7]
gemfile: [Gemfile]
include:
- os: ubuntu-latest
ruby: 2.3.3
ruby: 2.6
gemfile: gemfiles/Gemfile.xcodeproj-edge
- os: macos-10.15
ruby: 2.3.3
ruby: 2.6
gemfile: gemfiles/Gemfile.xcodeproj-edge
runs-on: ${{ matrix.os }}
env:
Expand Down
2 changes: 1 addition & 1 deletion lib/xcake/constants.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'active_support/core_ext/hash/deep_merge'
require 'deep_merge'

module Xcake
module Constants
Expand Down
15 changes: 6 additions & 9 deletions xcake.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
spec.executables = %w(xcake)
spec.require_paths = ['lib']

spec.required_ruby_version = '>= 2.3.3'
spec.required_ruby_version = '>= 2.6'

spec.add_dependency 'claide', '< 2.0', '>= 0.9.1'
spec.add_dependency 'cork'
spec.add_dependency 'deep_merge'
spec.add_dependency 'hooks', '~> 0.4.1'
spec.add_dependency 'xcodeproj', '< 2.0.0', '>= 1.3.0'

# Lock `activesupport` (transitive dependency via `xcodeproj`) to keep supporting system ruby
spec.add_dependency 'activesupport', '< 6'
spec.add_runtime_dependency 'claide', '< 2.0', '>= 0.9.1'
spec.add_runtime_dependency 'cork'
spec.add_runtime_dependency 'deep_merge'
spec.add_runtime_dependency 'hooks', '~> 0.4.1'
spec.add_runtime_dependency 'xcodeproj', '< 2.0.0', '>= 1.3.0'

spec.add_development_dependency 'bundler', '>= 1.10'
spec.add_development_dependency 'os', '~> 1.0'
Expand Down

0 comments on commit ad64ee2

Please # to comment.