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

Commits on Jan 6, 2017

  1. Copy the full SHA
    c91141a View commit details
  2. Copy the full SHA
    31b9253 View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 ci.hocon
  2. +1 −1 mx.jruby/suite.py
  3. +1 −1 tool/jt.rb
  4. +1 −1 truffle/pom.rb
  5. +1 −1 truffle/pom.xml
2 changes: 1 addition & 1 deletion ci.hocon
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ graal-vm-release: {
downloads: {
GRAALVM_DIR: {
name: graalvm-release,
version: "0.18",
version: "0.19",
platformspecific: true
}
}
2 changes: 1 addition & 1 deletion mx.jruby/suite.py
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ def mavenLib(mavenDep, sha1, sourceSha1, license):
{
"name": "truffle",
# Must be the same as in truffle/pom.rb (except for the -SNAPSHOT part only in pom.rb, and there we can use a release name)
"version": "332a893bdbc0cc4386da2067bd4fcfdcb168e6fc",
"version": "9df13defd34241a0bee2769b5b64c62611c3c042",
"urls": [
{"url": "https://github.com/graalvm/truffle.git", "kind": "git"},
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
require 'yaml'
require 'open3'

GRAALVM_VERSION = '0.18'
GRAALVM_VERSION = '0.19' # also change ci.hocon

JRUBY_DIR = File.expand_path('../..', __FILE__)
M2_REPO = File.expand_path('~/.m2/repository')
2 changes: 1 addition & 1 deletion truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
# Must be the same as in mx.jruby/suite.py (except for the -SNAPSHOT part only in this file, and here we can use a release name)
'truffle.version' => '0.20',
'truffle.version' => '0.21',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true'
)
2 changes: 1 addition & 1 deletion truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>0.20</truffle.version>
<truffle.version>0.21</truffle.version>
</properties>
<dependencies>
<dependency>