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

Commits on Jan 27, 2015

  1. Hack to make package-info.java emit a dummy class. 

    ...to avoid recompiling it every time.
    @headius
    headius committed Jan 27, 2015
    Copy the full SHA
    09721d6 View commit details

  2. Make lib depend on truffle for jruby-truffle jar.

    @headius
    headius committed Jan 27, 2015
    Copy the full SHA
    dbdfc4e View commit details
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/runtime/profile/builtin/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -4,4 +4,5 @@
*
* @author Andre Kullmann
*/
@Deprecated
package org.jruby.runtime.profile.builtin;
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/runtime/profile/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -68,4 +68,5 @@
*
* @author Andre Kullmann
*/
@Deprecated
package org.jruby.runtime.profile;
5 changes: 5 additions & 0 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,11 @@
<artifactId>jruby-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-truffle</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>