Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relax rails dependency #78

Merged
merged 1 commit into from
Jan 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ language: ruby
cache: bundler

rvm:
- 2.4.1
- 2.6
- 2.5
- 2.4
55 changes: 4 additions & 51 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@ PATH
remote: .
specs:
has_friendship (1.1.7)
rails (>= 4.2.0, <= 6.0.0)
activemodel (>= 4.2.0, < 6.1)
activerecord (>= 4.2.0, < 6.1)
activesupport (>= 4.2.0, < 6.1)
stateful_enum

GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.0)
actionpack (= 5.2.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
Expand All @@ -31,19 +23,12 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.0)
activesupport (= 5.2.0)
globalid (>= 0.3.6)
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
arel (>= 9.0)
activestorage (5.2.0)
actionpack (= 5.2.0)
activerecord (= 5.2.0)
marcel (~> 0.3.1)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
Expand All @@ -70,8 +55,6 @@ GEM
generator_spec (0.9.4)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.14.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
Expand All @@ -97,17 +80,10 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
nenv (0.3.0)
nio4r (2.5.1)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.5-x64-mingw32)
Expand All @@ -121,19 +97,6 @@ GEM
rack (2.0.5)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.2.0)
actioncable (= 5.2.0)
actionmailer (= 5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
activemodel (= 5.2.0)
activerecord (= 5.2.0)
activestorage (= 5.2.0)
activesupport (= 5.2.0)
bundler (>= 1.3.0)
railties (= 5.2.0)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
Expand Down Expand Up @@ -183,13 +146,6 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sqlite3 (1.3.13-x64-mingw32)
stateful_enum (0.6.0)
Expand All @@ -202,9 +158,6 @@ GEM
thread_safe (~> 0.1)
tzinfo-data (1.2018.5)
tzinfo (>= 1.0.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)

PLATFORMS
ruby
Expand All @@ -222,4 +175,4 @@ DEPENDENCIES
tzinfo-data

BUNDLED WITH
1.17.2
1.17.3
7 changes: 6 additions & 1 deletion has_friendship.gemspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
RAILS_VERSIONS = ['>= 4.2.0', '< 6.1'].freeze

$:.push File.expand_path("../lib", __FILE__)

# Maintain your gem's version:
Expand All @@ -16,7 +18,10 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
s.required_ruby_version = '>= 2.4.1'

s.add_dependency "rails", ['>= 4.2.0', '<= 6.0.0']
s.add_dependency "activesupport", RAILS_VERSIONS
s.add_dependency "activemodel", RAILS_VERSIONS
s.add_dependency "activerecord", RAILS_VERSIONS

s.add_dependency "stateful_enum"

s.add_development_dependency "sqlite3"
Expand Down
Empty file.
13 changes: 0 additions & 13 deletions spec/internal/app/assets/javascripts/application.js

This file was deleted.

15 changes: 0 additions & 15 deletions spec/internal/app/assets/stylesheets/application.css

This file was deleted.

8 changes: 4 additions & 4 deletions spec/internal/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

# Pick the frameworks you want:
require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
require "action_view/railtie"
require "sprockets/railtie"
# require "action_controller/railtie"
# require "action_mailer/railtie"
# require "action_view/railtie"
# require "sprockets/railtie"
# require "rails/test_unit/railtie"

Bundler.require(*Rails.groups)
Expand Down
2 changes: 1 addition & 1 deletion spec/internal/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
# config.action_mailer.delivery_method = :test

# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
Expand Down
8 changes: 0 additions & 8 deletions spec/internal/config/initializers/assets.rb

This file was deleted.