Skip to content

Support & test JRuby #7

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

Merged
merged 3 commits into from
Aug 20, 2013
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: ruby
rvm:
- 2.0.0
- 1.9.3
- jruby-19mode
before_install:
- gem install bundler --version '>= 1.2.2'
before_script: 'bundle exec rake appraisal:install'
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_3.1.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PATH
remote: /home/jakub/code/react-rails
remote: /Users/poshannessy/FB/code/react-rails
specs:
react-rails (0.4.1.0)
execjs
Expand Down Expand Up @@ -48,6 +48,7 @@ GEM
i18n (0.6.4)
journey (1.0.4)
json (1.8.0)
json (1.8.0-java)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand Down Expand Up @@ -85,7 +86,6 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
thor (0.18.1)
tilt (1.4.1)
treetop (1.4.14)
Expand All @@ -94,11 +94,11 @@ GEM
tzinfo (0.3.37)

PLATFORMS
java
ruby

DEPENDENCIES
appraisal
bundler (>= 1.2.2)
rails (~> 3.1)
react-rails!
sqlite3
6 changes: 3 additions & 3 deletions gemfiles/rails_3.2.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PATH
remote: /home/jakub/code/react-rails
remote: /Users/poshannessy/FB/code/react-rails
specs:
react-rails (0.4.1.0)
execjs
Expand Down Expand Up @@ -48,6 +48,7 @@ GEM
i18n (0.6.4)
journey (1.0.4)
json (1.8.0)
json (1.8.0-java)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand Down Expand Up @@ -85,7 +86,6 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
thor (0.18.1)
tilt (1.4.1)
treetop (1.4.14)
Expand All @@ -94,11 +94,11 @@ GEM
tzinfo (0.3.37)

PLATFORMS
java
ruby

DEPENDENCIES
appraisal
bundler (>= 1.2.2)
rails (~> 3.2)
react-rails!
sqlite3
8 changes: 5 additions & 3 deletions gemfiles/rails_4.0.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PATH
remote: /home/jakub/code/react-rails
remote: /Users/poshannessy/FB/code/react-rails
specs:
react-rails (0.4.1.0)
execjs
Expand Down Expand Up @@ -38,6 +38,7 @@ GEM
rake
arel (4.0.0)
atomic (1.1.12)
atomic (1.1.12-java)
builder (3.1.4)
erubis (2.7.0)
execjs (1.4.0)
Expand Down Expand Up @@ -78,22 +79,23 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.7)
thor (0.18.1)
thread_safe (0.1.2)
atomic
thread_safe (0.1.2-java)
atomic
tilt (1.4.1)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)

PLATFORMS
java
ruby

DEPENDENCIES
appraisal
bundler (>= 1.2.2)
rails (~> 4.0)
react-rails!
sqlite3
1 change: 0 additions & 1 deletion react-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Gem::Specification.new do |s|

s.add_development_dependency "bundler", [">= 1.2.2"]
s.add_development_dependency "appraisal"
s.add_development_dependency "sqlite3" # needed for the dummy app

s.add_dependency 'execjs'
s.add_dependency 'rails', '>= 3.1'
Expand Down
7 changes: 6 additions & 1 deletion test/dummy/config/application.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
require File.expand_path('../boot', __FILE__)

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

Bundler.require(*Rails.groups)
require "react-rails"
Expand Down
25 changes: 0 additions & 25 deletions test/dummy/config/database.yml

This file was deleted.

3 changes: 0 additions & 3 deletions test/dummy/config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log

# Raise an error on page load if there are pending migrations
config.active_record.migration_error = :page_load

# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
Expand Down
Empty file removed test/dummy/db/test.sqlite3
Empty file.