Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 61f8da434ac2
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 926506577704
Choose a head ref

Commits on Apr 30, 2015

  1. Copy the full SHA
    979debc View commit details

Commits on May 1, 2015

  1. Copy the full SHA
    21fa527 View commit details
  2. Copy the full SHA
    4152b9b View commit details
  3. Copy the full SHA
    adc95e0 View commit details
  4. Copy the full SHA
    58c6722 View commit details
  5. [Truffle] adopt interop api changes and support more features (e.g. n…

    …il?)
    Matthias Grimmer committed May 1, 2015
    Copy the full SHA
    3232315 View commit details
  6. [Truffle] minor interop fixes

    Matthias Grimmer committed May 1, 2015
    Copy the full SHA
    f7f8ad7 View commit details
  7. [Truffle] minor interop fixes 2

    Matthias Grimmer committed May 1, 2015
    Copy the full SHA
    0c41e96 View commit details
  8. Copy the full SHA
    ec1bf1f View commit details
  9. Copy the full SHA
    33fae76 View commit details
  10. [Truffle] ignore src_gen files

    Matthias Grimmer committed May 1, 2015
    Copy the full SHA
    db87331 View commit details
  11. [Truffle] merge fix

    Matthias Grimmer committed May 1, 2015
    Copy the full SHA
    14a344f View commit details

Commits on May 2, 2015

  1. Copy the full SHA
    dd5eb06 View commit details
  2. Copy the full SHA
    bcda96e View commit details
  3. [Truffle] add missing RubyMethodForeignAccessFactory

    Matthias Grimmer committed May 2, 2015
    Copy the full SHA
    5d8ce18 View commit details
  4. Copy the full SHA
    83327ee View commit details

Commits on May 3, 2015

  1. Copy the full SHA
    ff7d4fe View commit details
  2. Copy the full SHA
    2fb2788 View commit details

Commits on May 4, 2015

  1. Copy the full SHA
    fc94c95 View commit details
  2. Copy the full SHA
    4ab6c57 View commit details

Commits on May 7, 2015

  1. Copy the full SHA
    e87a864 View commit details
  2. Copy the full SHA
    d41a2b5 View commit details
  3. Copy the full SHA
    293435f View commit details
  4. Copy the full SHA
    251030d View commit details
  5. Copy the full SHA
    2ec8488 View commit details
  6. Copy the full SHA
    91f0407 View commit details

Commits on May 8, 2015

  1. Copy the full SHA
    bd54763 View commit details

Commits on May 9, 2015

  1. Merge branch 'master' into truffle-head

    Conflicts:
    	truffle/src/main/java/org/jruby/truffle/nodes/core/BindingNodes.java
    chrisseaton committed May 9, 2015
    Copy the full SHA
    08193c6 View commit details
  2. Copy the full SHA
    01c49d7 View commit details
  3. Copy the full SHA
    5de0ab0 View commit details
  4. Copy the full SHA
    e78948f View commit details

Commits on May 10, 2015

  1. Merge branch 'master' into truffle-head

    Conflicts:
    	truffle/src/main/java/org/jruby/truffle/nodes/interop/InteropNode.java
    chrisseaton committed May 10, 2015
    Copy the full SHA
    2660d99 View commit details

Commits on May 12, 2015

  1. Copy the full SHA
    c0d2d92 View commit details
  2. Copy the full SHA
    424e351 View commit details

Commits on May 13, 2015

  1. Copy the full SHA
    0f5f903 View commit details
  2. Copy the full SHA
    bf4bacb View commit details

Commits on May 14, 2015

  1. Copy the full SHA
    b510646 View commit details
  2. Copy the full SHA
    c966b40 View commit details
  3. Copy the full SHA
    56ca99e View commit details
  4. Copy the full SHA
    2fe04df View commit details
  5. Copy the full SHA
    f60bfba View commit details

Commits on May 16, 2015

  1. Copy the full SHA
    4bd8d71 View commit details

Commits on May 17, 2015

  1. Copy the full SHA
    29efc12 View commit details

Commits on May 18, 2015

  1. Copy the full SHA
    3fb7694 View commit details
  2. Copy the full SHA
    4cdf4f9 View commit details

Commits on May 20, 2015

  1. Merge branch 'master' into truffle-head

    Conflicts:
    	truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
    	truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
    chrisseaton committed May 20, 2015
    Copy the full SHA
    c40d698 View commit details

Commits on May 24, 2015

  1. Copy the full SHA
    69d8085 View commit details

Commits on May 25, 2015

  1. Copy the full SHA
    bffa746 View commit details

Commits on May 26, 2015

  1. Copy the full SHA
    e57f7a4 View commit details
  2. Copy the full SHA
    48dcafc View commit details
Showing 6,453 changed files with 319,345 additions and 145,696 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -13,6 +13,9 @@
*.versionsBackup
*.zip
*~
*.tokens
*.su
*.ll

.DS_Store
.debug.properties
@@ -21,6 +24,9 @@
build
build.properties
build_graph.png
mx*/*pyc
mx*/env
mxbuild
core/src/main/java/org/jruby/runtime/Constants.java
dependency-reduced-pom.xml
dev_null
@@ -43,11 +49,14 @@ lib/ruby/gems
lib/ruby/stdlib/*jopenssl*.jar
lib/ruby/stdlib/bcpkix-jdk15on-*.jar
lib/ruby/stdlib/bcprov-jdk15on-*.jar
lib/ruby/stdlib/did_you_mean*
lib/ruby/stdlib/gauntlet_rdoc.rb
lib/ruby/stdlib/jar*
lib/ruby/stdlib/jline
lib/ruby/stdlib/jopenssl*
lib/ruby/stdlib/krypt*
lib/ruby/stdlib/net-telnet.rb
lib/ruby/stdlib/net/telnet*
lib/ruby/stdlib/openssl*
lib/ruby/stdlib/org/
lib/ruby/stdlib/readline/*readline*.jar
@@ -70,6 +79,7 @@ test/prawn
test/rails
test/testapp/testapp
test/truffle/*.methods
test/truffle/integration/gem-testing
tool/nailgun/Makefile
tool/nailgun/config.log
tool/nailgun/config.status
@@ -78,6 +88,7 @@ reference.txt
rubyspec_temp
.polyglot.pom.rb
tool/truffle/jruby_truffle_runner/jruby+truffle_runner-*.gem
test/truffle/cexts/**/Makefile

# binaries
!bin/gem
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.11</version>
<version>0.1.15</version>
</extension>
</extensions>
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.1/apache-maven-3.3.1-bin.zip
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
76 changes: 51 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,15 +2,18 @@ language: java

sudo: false

#cache:
# directories:
# - $HOME/.m2
cache:
directories:
- $HOME/.m2

before_script:
before_install:
- export MAVEN_SKIP_RC=true
- export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=512m"
- mvn -Xmx32M -v | grep 1.7.0; if [ $? = 0 ]; then export MAVEN_OPTS="-XX:MaxPermSize=240M"; else export MAVEN_OPTS="-XX:MaxMetaspaceSize=240M -XX:CompressedClassSpaceSize=240M"; fi
- export MAVEN_OPTS="-Xmx512M $MAVEN_OPTS"

before_script:
- unset GEM_PATH GEM_HOME IRBRC JRUBY_OPTS
- "export PATH=`pwd`/bin:$PATH"
- export PATH="`pwd`/bin:$PATH"
- echo $HOME

jdk:
@@ -22,29 +25,27 @@ os:

env:
global:
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmn48M -Xmx512M"
- MALLOC_ARENA_MAX=2
matrix:
- PHASE='-Ptest'
- PHASE='-Prake -Dtask=test:jruby'
- PHASE='-Prake -Dtask=test:jruby:fullint'
- PHASE='-Prake -Dtask=test:jruby:jit'
- PHASE='-Prake -Dtask=test:mri'
- PHASE='-Prake -Dtask=test:mri:fullint'
- PHASE='-Prake -Dtask=test:mri:jit'
- PHASE='-Prake -Dtask=test:slow_suites'
- PHASE='-Prake -Dtask=test:tracing'
- PHASE='-Prake -Dtask=spec:ji'
- PHASE='-Prake -Dtask=spec:compiler'
- PHASE='-Prake -Dtask=spec:compiler' JRUBY_OPTS=-Xcompile.invokedynamic
- PHASE='-Prake -Dtask=spec:ffi'
- PHASE='-Prake -Dtask=spec:regression'
- PHASE='-Prake -Dtask=spec:ruby:fast'
- PHASE='-Prake -Dtask=spec:jruby'
- PHASE='-Prake -Dtask=spec:jrubyc'
- PHASE='-Prake -Dtask=spec:profiler'
- PHASE='-Ptruffle-specs-language'
- PHASE='-Ptruffle-specs-core'
- PHASE='-Ptruffle-specs-library'
- PHASE='-Ptruffle-specs-truffle'
- PHASE='-Ptruffle-mri-tests'

matrix:
include:
@@ -70,11 +71,41 @@ matrix:
jdk: oraclejdk8
- env: COMMAND=test/check_versions.sh
jdk: oraclejdk8
- env: COMMAND=tool/truffle-findbugs.sh
# JRuby+Truffle needs Java 8
- env: JT='test specs :command_line'
jdk: oraclejdk8
- env: JT='test specs :language'
jdk: oraclejdk8
- env: JT='test specs :core'
jdk: oraclejdk8
- env: JT='test specs :library'
jdk: oraclejdk8
- env: JT='test specs :truffle'
jdk: oraclejdk8
- env: COMMAND='ruby tool/jt.rb check_ambiguous_arguments'
- env: JT='test integration'
jdk: oraclejdk8
- env: COMMAND=test/truffle/integration-tests.sh
- env:
- COMMAND=test/truffle/gems/install-gems.sh
- JT='test gems'
jdk: oraclejdk8
- env:
- JAVA_OPTS="$JAVA_OPTS -Xmx512m"
- HAS_REDIS=true
- JT='test ecosystem'
jdk: oraclejdk8
- env: JT='test tck'
jdk: oraclejdk8
- env:
- JT=check_ambiguous_arguments
- SKIP_BUILD=true
jdk: oraclejdk8
- env:
- USE_BUILD_PACK=yes
- JT='test fast'
jdk: oraclejdk8
allow_failures:
- env: PHASE='-Prake -Dtask=test:mri:fullint'
- env: JT='test mri'
jdk: oraclejdk8
# NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
#- env: PHASE='-Pmain'
@@ -83,16 +114,8 @@ matrix:
# group: edge
# jdk: oraclejdk9

branches:
only:
- master
- jruby-1_7
- truffle-head
- /^test-.*$/
- /^ha-feature/

script: if [[ -v COMMAND ]]; then $COMMAND; else ./mvnw install -Dinvoker.skip=false $PHASE | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$' ; [ ${PIPESTATUS[0]} == 0 ]; fi
install: travis_retry ./mvnw -Pbootstrap clean install -Dinvoker.skip -Dmaven.test.skip
install: tool/travis-install.sh
script: tool/travis-script.sh

notifications:
irc:
@@ -111,3 +134,6 @@ notifications:
# we are on a branch
on_success: always
on_failure: never

services:
- redis-server
4 changes: 2 additions & 2 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
JRuby is Copyright (c) 2007-2015 The JRuby project, and is released
JRuby is Copyright (c) 2007-2016 The JRuby project, and is released
under a tri EPL/GPL/LGPL license. You can use it, redistribute it
and/or modify it under the terms of the:

@@ -12,7 +12,7 @@ bytelist (http://github.com/jruby/bytelist),
yydebug (http://svn.codehaus.org/jruby/trunk/jay/yydebug)
are released under the same copyright/license.

The Truffle component is copyright (c) 2013-2015 Oracle and/or its
The Truffle component is copyright (c) 2013-2016 Oracle and/or its
affiliates and is released under the same licenses.

Some additional libraries distributed with JRuby are not covered by
20 changes: 20 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
### Environment

Provide at least:
* JRuby version (`jruby -v`) and command line (flags, JRUBY_OPTS, etc)
* Operating system and platform (e.g. `uname -a`)

Other relevant info you may wish to add:
* Installed or activated gems
* Application/framework version (e.g. Rails, Sinatra)
* Environment variables

### Expected Behavior

* Describe your expectation of how JRuby should behave, perhaps by showing how CRuby/MRI behaves.
* Provide an executable Ruby script or a link to an example repository.

### Actual Behavior

* Describe or show the actual behavior.
* Provide text or screen capture showing the behavior.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ It aims to be a complete, correct and fast implementation of Ruby, at the same
time as providing powerful new features such as concurrency without a
[global-interpreter-lock](http://en.wikipedia.org/wiki/Global_Interpreter_Lock),
true parallelism, and tight integration to the Java language to allow you to
uses Java classes in your Ruby program and to allow JRuby to be embedded into a
use Java classes in your Ruby program and to allow JRuby to be embedded into a
Java application.

You can use JRuby simply as a faster version of Ruby, you can use it to run Ruby
@@ -40,7 +40,7 @@ For [`rbenv`](https://github.com/sstephenson/rbenv) you will need the
package manager can provide these. Then you can run:

```
$ rbenv install jruby-9.0.0.0-dev
$ rbenv install jruby-9.0.5.0
```

For [`rvm`](https://rvm.io) you can simply do:
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.0.5.0-SNAPSHOT
9.1.3.0-SNAPSHOT
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@ build: off

environment:
matrix:
- JAVA_HOME: C:\Program Files\Java\jdk1.7.0
- JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0
- JAVA_HOME: C:\Program Files\Java\jdk1.8.0
- JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0

File renamed without changes.
Loading