Skip to content

Commit

Permalink
Upgrades to to JRuby 9.1.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lyttam committed Apr 16, 2018
1 parent dc24345 commit b2499da
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .rvmrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
# chmod +x ${rvm_path}/hooks/after_use_jruby_opts

rvm --create use jruby-9.1.5.0@calcentral
rvm --create use jruby-9.1.14.0@calcentral
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ cache: bundler
dist: precise

rvm:
- jruby-9.1.5.0
- jruby-9.1.14.0

matrix:
include:
- { rvm: jruby-9.1.5.0 }
- { rvm: jruby-9.1.14.0 }

env:
- JRUBY_OPTS="--dev -J-Xmx900m" DISPLAY=:99.0 LOGGER_LEVEL=WARN TRAVIS_NODE_VERSION="8"

before_install:
- gem update --system 2.4.5
- gem update --system 2.5.1

before_script:
- ./script/front-end-build.sh
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN git clone https://github.com/sstephenson/ruby-build.git /tmp/ruby-build && \
RUN ruby-build --definitions

# Install ruby
RUN ruby-build -v jruby-9.1.5.0 /usr/local
RUN ruby-build -v jruby-9.1.14.0 /usr/local

# Install base gems
RUN gem install bundler rubygems-bundler --no-rdoc --no-ri
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* [Git](https://help.github.com/articles/set-up-git)
* [JDBC Oracle driver](http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html)
* [Java 8 SDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
* [JRuby 9.1.5.0](http://jruby.org/)
* [JRuby 9.1.14.0](http://jruby.org/)
* [Node.js >=0.10.30](http://nodejs.org/)
* [PostgreSQL](http://www.postgresql.org/)
* [Rails 3.2.x](http://rubyonrails.org/download)
Expand Down Expand Up @@ -133,7 +133,7 @@ http://www.oracle.com/technetwork/java/javase/downloads/index.html
* Download [ojdbc7_g.jar](http://www.oracle.com/technetwork/database/features/jdbc/jdbc-drivers-12c-download-1958347.html)
* Note: You do not have to open the file.
* Rename the file to `ojdbc7.jar`
* Copy `ojdbc7.jar` to `~/.rvm/rubies/jruby-1.7.19/lib/`
* Copy `ojdbc7.jar` to `~/.rvm/rubies/jruby-9.1.14.0/lib/`
1. Initialize PostgreSQL database tables:
Expand Down

0 comments on commit b2499da

Please sign in to comment.