Skip to content

Commit b46c016

Browse files
authored
Merge pull request #528 from tricknotes/update-dependencies
Update dependencies
2 parents 59b84cd + 33add73 commit b46c016

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.travis.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
language: ruby
12
sudo: false
23
rvm:
34
- 2.1
4-
- 2.2.4
5-
- 2.3.0
6-
- jruby-9.0.5.0
5+
- 2.2.5
6+
- 2.3.1
7+
- jruby-9.1.0.0
78
cache:
89
- bundler
910
before_script:
@@ -34,17 +35,17 @@ matrix:
3435
gemfile: gemfiles/rails50_ember_18.gemfile
3536
- rvm: 2.1
3637
gemfile: gemfiles/rails50_ember_latest.gemfile
37-
- rvm: jruby-9.0.5.0
38+
- rvm: jruby-9.1.0.0
3839
gemfile: gemfiles/rails40_ember_113.gemfile
39-
- rvm: jruby-9.0.5.0
40+
- rvm: jruby-9.1.0.0
4041
gemfile: gemfiles/rails50_ember_113.gemfile
41-
- rvm: jruby-9.0.5.0
42+
- rvm: jruby-9.1.0.0
4243
gemfile: gemfiles/rails40_ember_18.gemfile
43-
- rvm: jruby-9.0.5.0
44+
- rvm: jruby-9.1.0.0
4445
gemfile: gemfiles/rails50_ember_18.gemfile
45-
- rvm: jruby-9.0.5.0
46+
- rvm: jruby-9.1.0.0
4647
gemfile: gemfiles/rails40_ember_latest.gemfile
47-
- rvm: jruby-9.0.5.0
48+
- rvm: jruby-9.1.0.0
4849
gemfile: gemfiles/rails50_ember_latest.gemfile
4950
env:
5051
- JRUBY_OPTS="--server -J-Xms1500m -J-Xmx1500m -J-XX:+UseConcMarkSweepGC -J-XX:-UseGCOverheadLimit -J-XX:+CMSClassUnloadingEnabled" # see: https://github.com/jruby/jruby/issues/1320

gemfiles/rails50_ember_113.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '~> 5.0.0.beta1'
3+
gem 'rails', '~> 5.0.0'
44
gem 'ember-source', '~> 1.13.0'
55

66
gemspec path: '../'

gemfiles/rails50_ember_18.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '~> 5.0.0.beta1'
3+
gem 'rails', '~> 5.0.0'
44
gem 'ember-source', '~> 1.8.0'
55
gem 'handlebars-source', '~> 1.0.0'
66

gemfiles/rails50_ember_latest.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '~> 5.0.0.beta1'
3+
gem 'rails', '~> 5.0.0'
44
gem 'ember-source', '~> 2.2.0'
55

66
gemspec path: '../'

0 commit comments

Comments
 (0)