[Truffle] Update to Truffle 0.14 and GraalVM 0.12

jruby · Jun 7, 2016 · 95bdc20 · 95bdc20
1 parent f127aeb
commit 95bdc20
Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ci.hocon b/ci.hocon
@@ -40,7 +40,7 @@ graal-core: {
     [cd, graal-workspace],
     [mx, sclone, --kind, git, "https://github.com/graalvm/graal-core.git", graal-core],
     [cd, graal-core],
-    [git, checkout, "3a28fca1b331f9912dabd231052354cffa9dee9c"],
+    [git, checkout, graal-vm-0.12],
     [mx, sforceimports],
     [mx, --vm, server, build],
     [cd, ../..]
@@ -57,7 +57,7 @@ graalvm: {
   downloads: {
     GRAALVM_DIR: {
       name: graalvm-release,
-      version: "0.11",
+      version: "0.12",
       platformspecific: true
     }
   }

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -17,7 +17,7 @@
 require 'json'
 require 'timeout'
 
-GRAALVM_VERSION = "0.11"
+GRAALVM_VERSION = '0.12'
 
 JRUBY_DIR = File.expand_path('../..', __FILE__)
 M2_REPO = File.expand_path('~/.m2/repository')

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -9,7 +9,7 @@
 
   properties( 'polyglot.dump.pom' => 'pom.xml',
               'polyglot.dump.readonly' => true,
-              'truffle.version' => '0.13',
+              'truffle.version' => '0.14',
               'jruby.basedir' => '${basedir}/..',
               'maven.test.skip' => 'true' )
 

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -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.13</truffle.version>
+    <truffle.version>0.14</truffle.version>
   </properties>
   <dependencies>
     <dependency>