[Truffle] Update Truffle to include my fix.

jruby · Oct 12, 2016 · d54a835 · d54a835 · nirvdrum · Oct 12, 2016
1 parent 8a4e539
commit d54a835
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/mx.jruby/suite.py b/mx.jruby/suite.py
@@ -35,7 +35,7 @@ def mavenLib(mavenDep, sha1, sourceSha1):
             {
                 "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": "26a836113b25ee06102940e88da92cc6016922b5",
+                "version": "af21c6632dbc4e8c48cd25d0b7d623d379c888e6",
                 "urls": [
                     {"url": "https://github.com/graalvm/truffle.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -10,18 +10,17 @@
   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.18',
+              'truffle.version' => 'af21c6632dbc4e8c48cd25d0b7d623d379c888e6-SNAPSHOT',
               'jruby.basedir' => '${basedir}/..',
               'maven.test.skip' => 'true' )
 
   jar 'org.yaml:snakeyaml:1.14'
   jar 'org.antlr:antlr4-runtime:4.5.1-1'
 
   jar 'org.jruby:jruby-core', '${project.version}', :scope => 'provided'
-
-  #repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
-  #            :id => 'truffle' )
-
+
+  repository(:url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/', :id => 'truffle')
+
   truffle_version = '${truffle.version}'
   jar 'com.oracle.truffle:truffle-api:' + truffle_version
   jar 'com.oracle.truffle:truffle-debug:' + truffle_version

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.18</truffle.version>
+    <truffle.version>af21c6632dbc4e8c48cd25d0b7d623d379c888e6-SNAPSHOT</truffle.version>
   </properties>
   <dependencies>
     <dependency>
@@ -68,6 +68,12 @@ DO NOT MODIFIY - GENERATED CODE
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>truffle</id>
+      <url>http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
   <build>
     <defaultGoal>package</defaultGoal>
     <resources>