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: 08ecc3c4b086
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a741a82fc802
Choose a head ref
  • 2 commits
  • 20 files changed
  • 1 contributor

Commits on Jul 7, 2015

  1. Bump for 1.7.21

    @enebo
    enebo committed Jul 7, 2015
    Copy the full SHA
    e5955c8 View commit details

  2. Off by one error in proc to interface optimization for 2 and 3 arity … 

    …paths (still missing test)
    @enebo
    enebo committed Jul 7, 2015
    1
    Copy the full SHA
    a741a82 View commit details
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.21-SNAPSHOT
1.7.21
10 changes: 5 additions & 5 deletions antlib/extra.xml
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -137,7 +137,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -153,7 +153,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -169,7 +169,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.21.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -461,7 +461,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.21.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby-core</artifactId>
<packaging>jar</packaging>
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/javasupport/Java.java
View file
Original file line number Diff line number Diff line change
@@ -1150,8 +1150,8 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
final IRubyObject[] newArgs;
switch( args.length ) {
case 1 : newArgs = IRubyObject.NULL_ARRAY; break;
case 2 : newArgs = new IRubyObject[] { args[0] }; break;
case 3 : newArgs = new IRubyObject[] { args[0], args[1] }; break;
case 2 : newArgs = new IRubyObject[] { args[1] }; break;
case 3 : newArgs = new IRubyObject[] { args[1], args[2] }; break;
default : newArgs = new IRubyObject[ args.length - 1 ];
System.arraycopy(args, 1, newArgs, 0, newArgs.length);
}
2 changes: 1 addition & 1 deletion docs/man/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>docs</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>

<groupId>org.jruby</groupId>
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>

<groupId>org.jruby</groupId>
4 changes: 2 additions & 2 deletions ext/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-ext</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
<packaging>pom</packaging>

<name>JRuby Ext</name>
2 changes: 1 addition & 1 deletion ext/readline/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-ext</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>readline</artifactId>
<version>1.0</version>
4 changes: 2 additions & 2 deletions ext/ripper/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-ext</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>ripper</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
<packaging>jar</packaging>

<name>JRuby Ripper</name>
4 changes: 2 additions & 2 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby-lib</artifactId>
<packaging>pom</packaging>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>rubygems</groupId>
2 changes: 1 addition & 1 deletion maven/jruby-complete/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby-complete</artifactId>
<packaging>bundle</packaging>
2 changes: 1 addition & 1 deletion maven/jruby-dist/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby-dist</artifactId>
<packaging>pom</packaging>
2 changes: 1 addition & 1 deletion maven/jruby-jars/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<groupId>rubygems</groupId>
<artifactId>jruby-jars</artifactId>
2 changes: 1 addition & 1 deletion maven/jruby-noasm/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby-noasm</artifactId>
<packaging>bundle</packaging>
2 changes: 1 addition & 1 deletion maven/jruby-rake-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
2 changes: 1 addition & 1 deletion maven/jruby-stdlib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Stdlib</name>
2 changes: 1 addition & 1 deletion maven/jruby/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby</artifactId>
<name>JRuby Main Maven Artifact</name>
2 changes: 1 addition & 1 deletion maven/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby-artifacts</artifactId>
<packaging>pom</packaging>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
<packaging>pom</packaging>

<name>JRuby</name>
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.21-SNAPSHOT</version>
<version>1.7.21</version>
</parent>
<artifactId>jruby-tests</artifactId>
<packaging>jar</packaging>