Skip to content

Commit c0a2b5c

Browse files
committed
appraise with Rails 4.0 (stable) as well
1 parent f0370ae commit c0a2b5c

File tree

3 files changed

+70
-90
lines changed

3 files changed

+70
-90
lines changed

Appraisals

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
appraise "rails23" do
2-
gem "rails", "~> 2.3.17"
2+
gem "rails", "~> 2.3.18"
33
end
44

55
appraise "rails30" do
66
gem "rails", "~> 3.0.20"
77
end
88

99
appraise "rails31" do
10-
gem "rails", "~> 3.1.11"
10+
gem "rails", "~> 3.1.12"
1111
end
1212

1313
appraise "rails32" do
14-
gem "rails", "~> 3.2.12"
14+
gem "rails", "~> 3.2.14"
1515
end
1616

1717
appraise "rails40" do
18-
gem 'rails', :github => 'rails/rails'
18+
gem "rails", "~> 4.0.0"
19+
end
20+
21+
#appraise "rails41" do
22+
# gem 'rails', :github => 'rails/rails', :branch => 'master'
1923
#gem 'journey', :github => 'rails/journey'
2024
#gem 'activerecord-deprecated_finders', :require => nil,
2125
#:github => 'rails/activerecord-deprecated_finders'
2226
# TODO Rails 4.0 (once again) forces us to use ActiveRecord :
2327
# Java::OrgJrubyRack::RackInitializationException:
2428
# No such file or directory - [...]/jruby-rack/src/spec/stub/rails40/WEB-INF/config/database.yml
25-
gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter'
26-
gem 'activerecord-jdbcsqlite3-adapter', :github => 'jruby/activerecord-jdbc-adapter'
27-
end
29+
# gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter'
30+
# gem 'activerecord-jdbcsqlite3-adapter', :github => 'jruby/activerecord-jdbc-adapter'
31+
#end

gemfiles/rails40.gemfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ source "https://rubygems.org"
55
gem "rack"
66
gem "appraisal"
77
gem "rake", :group=>:test
8-
gem "rspec", "~> 2.11", :group=>:test
9-
gem "jruby-openssl", :group=>:test
10-
gem "rails", :github=>"rails/rails"
11-
gem "activerecord-jdbc-adapter", :github=>"jruby/activerecord-jdbc-adapter"
12-
gem "activerecord-jdbcsqlite3-adapter", :github=>"jruby/activerecord-jdbc-adapter"
8+
gem "rspec", "~> 2.13.0", :group=>:test
9+
gem "jruby-openssl", ">= 0.8.2", :group=>:test
10+
gem "rails", "~> 4.0.0"
1311

gemfiles/rails40.gemfile.lock

Lines changed: 56 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,100 @@
1-
GIT
2-
remote: git://github.com/jruby/activerecord-jdbc-adapter.git
3-
revision: 62ea1b3a711384b413b8c562c82ef5e984c81c14
4-
specs:
5-
activerecord-jdbc-adapter (1.3.0.DEV)
6-
activerecord-jdbcsqlite3-adapter (1.3.0.DEV)
7-
activerecord-jdbc-adapter (~> 1.3.0.DEV)
8-
jdbc-sqlite3 (~> 3.7.2)
9-
10-
GIT
11-
remote: git://github.com/rails/rails.git
12-
revision: b67043393b5ed6079989513299fe303ec3bc133b
1+
GEM
2+
remote: https://rubygems.org/
133
specs:
14-
actionmailer (4.0.0.beta1)
15-
actionpack (= 4.0.0.beta1)
4+
actionmailer (4.0.0)
5+
actionpack (= 4.0.0)
166
mail (~> 2.5.3)
17-
actionpack (4.0.0.beta1)
18-
activesupport (= 4.0.0.beta1)
7+
actionpack (4.0.0)
8+
activesupport (= 4.0.0)
199
builder (~> 3.1.0)
2010
erubis (~> 2.7.0)
2111
rack (~> 1.5.2)
2212
rack-test (~> 0.6.2)
23-
activemodel (4.0.0.beta1)
24-
activesupport (= 4.0.0.beta1)
13+
activemodel (4.0.0)
14+
activesupport (= 4.0.0)
2515
builder (~> 3.1.0)
26-
activerecord (4.0.0.beta1)
27-
activemodel (= 4.0.0.beta1)
28-
activerecord-deprecated_finders (~> 0.0.3)
29-
activesupport (= 4.0.0.beta1)
30-
arel (~> 4.0.0.beta1)
31-
activesupport (4.0.0.beta1)
16+
activerecord (4.0.0)
17+
activemodel (= 4.0.0)
18+
activerecord-deprecated_finders (~> 1.0.2)
19+
activesupport (= 4.0.0)
20+
arel (~> 4.0.0)
21+
activerecord-deprecated_finders (1.0.3)
22+
activesupport (4.0.0)
3223
i18n (~> 0.6, >= 0.6.4)
3324
minitest (~> 4.2)
3425
multi_json (~> 1.3)
3526
thread_safe (~> 0.1)
36-
tzinfo (~> 0.3.33)
37-
rails (4.0.0.beta1)
38-
actionmailer (= 4.0.0.beta1)
39-
actionpack (= 4.0.0.beta1)
40-
activerecord (= 4.0.0.beta1)
41-
activesupport (= 4.0.0.beta1)
42-
bundler (>= 1.3.0, < 2.0)
43-
railties (= 4.0.0.beta1)
44-
sprockets-rails (~> 2.0.0.rc3)
45-
railties (4.0.0.beta1)
46-
actionpack (= 4.0.0.beta1)
47-
activesupport (= 4.0.0.beta1)
48-
rake (>= 0.8.7)
49-
rdoc (~> 3.4)
50-
thor (>= 0.17.0, < 2.0)
51-
52-
GEM
53-
remote: https://rubygems.org/
54-
specs:
55-
activerecord-deprecated_finders (0.0.3)
27+
tzinfo (~> 0.3.37)
5628
appraisal (0.5.1)
5729
bundler
5830
rake
59-
arel (4.0.0.beta1)
60-
atomic (1.0.1-java)
31+
arel (4.0.0)
32+
atomic (1.1.13-java)
6133
bouncy-castle-java (1.5.0146.1)
6234
builder (3.1.4)
63-
diff-lcs (1.1.3)
35+
diff-lcs (1.2.4)
6436
erubis (2.7.0)
65-
hike (1.2.1)
66-
i18n (0.6.4)
67-
jdbc-sqlite3 (3.7.2)
37+
hike (1.2.3)
38+
i18n (0.6.5)
6839
jruby-openssl (0.8.2)
6940
bouncy-castle-java (>= 1.5.0146.1)
70-
json (1.7.7-java)
71-
mail (2.5.3)
72-
i18n (>= 0.4.0)
41+
mail (2.5.4)
7342
mime-types (~> 1.16)
7443
treetop (~> 1.4.8)
75-
mime-types (1.21)
76-
minitest (4.6.2)
77-
multi_json (1.6.1)
44+
mime-types (1.25)
45+
minitest (4.7.5)
46+
multi_json (1.7.9)
7847
polyglot (0.3.3)
7948
rack (1.5.2)
8049
rack-test (0.6.2)
8150
rack (>= 1.0)
51+
rails (4.0.0)
52+
actionmailer (= 4.0.0)
53+
actionpack (= 4.0.0)
54+
activerecord (= 4.0.0)
55+
activesupport (= 4.0.0)
56+
bundler (>= 1.3.0, < 2.0)
57+
railties (= 4.0.0)
58+
sprockets-rails (~> 2.0.0)
59+
railties (4.0.0)
60+
actionpack (= 4.0.0)
61+
activesupport (= 4.0.0)
62+
rake (>= 0.8.7)
63+
thor (>= 0.18.1, < 2.0)
8264
rake (10.0.3)
83-
rdoc (3.12.2)
84-
json (~> 1.4)
85-
rspec (2.12.0)
86-
rspec-core (~> 2.12.0)
87-
rspec-expectations (~> 2.12.0)
88-
rspec-mocks (~> 2.12.0)
89-
rspec-core (2.12.2)
90-
rspec-expectations (2.12.1)
91-
diff-lcs (~> 1.1.3)
92-
rspec-mocks (2.12.2)
93-
sprockets (2.9.0)
65+
rspec (2.13.0)
66+
rspec-core (~> 2.13.0)
67+
rspec-expectations (~> 2.13.0)
68+
rspec-mocks (~> 2.13.0)
69+
rspec-core (2.13.1)
70+
rspec-expectations (2.13.0)
71+
diff-lcs (>= 1.1.3, < 2.0)
72+
rspec-mocks (2.13.1)
73+
sprockets (2.10.0)
9474
hike (~> 1.2)
9575
multi_json (~> 1.0)
9676
rack (~> 1.0)
9777
tilt (~> 1.1, != 1.3.0)
98-
sprockets-rails (2.0.0.rc3)
78+
sprockets-rails (2.0.0)
9979
actionpack (>= 3.0)
10080
activesupport (>= 3.0)
10181
sprockets (~> 2.8)
102-
thor (0.17.0)
103-
thread_safe (0.1.0)
82+
thor (0.18.1)
83+
thread_safe (0.1.2-java)
10484
atomic
105-
tilt (1.3.4)
106-
treetop (1.4.12)
85+
tilt (1.4.1)
86+
treetop (1.4.15)
10787
polyglot
10888
polyglot (>= 0.3.1)
109-
tzinfo (0.3.36)
89+
tzinfo (0.3.37)
11090

11191
PLATFORMS
11292
java
11393

11494
DEPENDENCIES
115-
activerecord-jdbc-adapter!
116-
activerecord-jdbcsqlite3-adapter!
11795
appraisal
118-
jruby-openssl
96+
jruby-openssl (>= 0.8.2)
11997
rack
120-
rails!
98+
rails (~> 4.0.0)
12199
rake
122-
rspec (~> 2.11)
100+
rspec (~> 2.13.0)

0 commit comments

Comments
 (0)