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: 023d74d8e8ae
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f6f3591f639b
Choose a head ref

Commits on Jul 6, 2015

  1. adds rmvn command since it comes with ruby-maven and make regular bin…

    …/mvn inside the gem executable
    mkristian committed Jul 6, 2015
    Copy the full SHA
    d0a2955 View commit details
  2. use user.dir as CWD when code is inside a jar on backquote execution

    when inside a jar the CWD is uri:classloader:/ and executing a system
    command can not change into this CWD. use java system property user.dir
    in such a case
    
    Sponsored by Lookout Inc.
    mkristian committed Jul 6, 2015
    Copy the full SHA
    1fd27e6 View commit details
  3. Copy the full SHA
    08ecc3c View commit details

Commits on Jul 7, 2015

  1. Bump for 1.7.21

    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 committed Jul 7, 2015
    1
    Copy the full SHA
    a741a82 View commit details
  3. Copy the full SHA
    424661f View commit details

Commits on Jul 8, 2015

  1. Copy the full SHA
    d51c9bf View commit details
  2. Update for next dev cycle

    enebo committed Jul 8, 2015
    Copy the full SHA
    bcc9b29 View commit details
  3. Copy the full SHA
    8e4b0bd View commit details

Commits on Jul 9, 2015

  1. Copy the full SHA
    6182486 View commit details

Commits on Jul 10, 2015

  1. Copy the full SHA
    207b8be View commit details

Commits on Jul 14, 2015

  1. Copy the full SHA
    3b68bdb View commit details
  2. Copy the full SHA
    2a6a6f5 View commit details
  3. Copy the full SHA
    cef1af3 View commit details
  4. make sure -Dorg.jruby.embed.compat.version=1.8 works

    with (JSR223) scripting-container (fixes #1365)
    kares committed Jul 14, 2015
    Copy the full SHA
    05531ea View commit details
  5. Copy the full SHA
    fe236a6 View commit details
  6. Copy the full SHA
    30cfff8 View commit details
  7. Copy the full SHA
    935553d View commit details

Commits on Jul 15, 2015

  1. spec for regression in proc to iface optimization

    complements commit a741a82
    kares committed Jul 15, 2015
    Copy the full SHA
    c79610c View commit details
  2. Copy the full SHA
    1d90f9f View commit details
  3. Copy the full SHA
    84a2051 View commit details
  4. Copy the full SHA
    27dc383 View commit details
  5. Copy the full SHA
    db7c111 View commit details
  6. Copy the full SHA
    6a9f22e View commit details
  7. Fixes #3135. Provide sha256 sums

    enebo committed Jul 15, 2015
    Copy the full SHA
    eaaa4f0 View commit details
  8. Copy the full SHA
    772bbcc View commit details
  9. Copy the full SHA
    106cdeb View commit details

Commits on Jul 16, 2015

  1. Copy the full SHA
    3264692 View commit details
  2. Copy the full SHA
    e893bb1 View commit details
  3. Copy the full SHA
    6c7320b View commit details
  4. avoid reflection in getFunctionalInterface

    ... while checking whether method.isDefault()
    kares committed Jul 16, 2015
    Copy the full SHA
    ddbed4b View commit details
  5. improve resolving functional-interfaces

    if there's an abstract method implemented by the Object.class
    (e.g. equals) continue looking for the "real" single method
    kares committed Jul 16, 2015
    Copy the full SHA
    f1353e3 View commit details
  6. support for matching proc-to-iface methods by arity

    ... of the block (see #3136) when there are 2 method with different
    interface type signature we can improve current (unpredictable) logic
    
    state prior to this commit is printing a ambiguous warning, the picked
    method depends on returned getMethods order
    kares committed Jul 16, 2015
    Copy the full SHA
    c054d50 View commit details
  7. method cache hash calc needs to acount for Proc

    so that we cache correctly cases with proc-to-iface dispatch
    (per Proc's arity)
    
    as a side effect redundant null checks were removed
    and the calculation should now compute the same when using args[]
    or the overloaded version (with args splatted)
    
    (closing #3136)
    kares committed Jul 16, 2015
    Copy the full SHA
    bd50c26 View commit details
  8. Copy the full SHA
    950cf3f View commit details
  9. no need for "" + ...

    kares committed Jul 16, 2015
    Copy the full SHA
    aedbf26 View commit details

Commits on Jul 17, 2015

  1. Merge branch 'jruby-1_7' into master

    * jruby-1_7: (36 commits)
      no need for "" + ...
      keep the test Java 6 compilable + more asserts
      method cache hash calc needs to acount for Proc
      support for matching proc-to-iface methods by arity
      improve resolving functional-interfaces
      avoid reflection in getFunctionalInterface
      some Java.getFunctionalInterfaceMethod asserts
      introduce a getFunctionalInterfaceMethod helper
      generix-ize some of JavaUtil's static helpers
      Make sure windows files generate signatures as part of post_process_artifacts
      Doh...how did this not get added
      Fixes #3135. Provide sha256 sums
      yet another multiple args proc-to-iface spec
      less deprecation warnings from implementation_spec
      clean + avoid deprecation warn in executor_spec
      less rspec deprecation warnings from ant spec
      avoid File#listFiles in spec since it's ambiguous
      spec for regression in proc to iface optimization
      Fix references to old mailing lists.
      Return nil when waitpid returns 0. Fixes #3117.
      ...
    
    Conflicts:
    	VERSION
    	antlib/extra.xml
    	core/pom.xml
    	core/src/main/java/org/jruby/RubyProcess.java
    	core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
    	core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
    	docs/man/pom.xml
    	docs/pom.xml
    	ext/pom.xml
    	ext/readline/pom.xml
    	ext/ripper/pom.xml
    	lib/pom.xml
    	maven/jruby-complete/pom.xml
    	maven/jruby-dist/pom.xml
    	maven/jruby-dist/src/main/assembly/jruby.xml
    	maven/jruby-jars/pom.xml
    	maven/jruby-noasm/pom.xml
    	maven/jruby-rake-plugin/pom.xml
    	maven/jruby-stdlib/pom.xml
    	maven/jruby/pom.xml
    	maven/pom.xml
    	pom.xml
    	test/pom.xml
    	test/test_backquote.rb
    	test/test_kernel.rb
    kares committed Jul 17, 2015
    Copy the full SHA
    bfb6c91 View commit details
  2. Merge branch 'master' of github.com:jruby/jruby

    * 'master' of github.com:jruby/jruby:
      split tests for jruby-jars and see if they are more stable on travis
      fix permission of lib/ruby/maven-home/bin/mvn
    kares committed Jul 17, 2015
    Copy the full SHA
    f6f3591 View commit details
Loading