From 7ea169ed20d26c4356cba62e43bc917021f1c582 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Mon, 25 Nov 2024 10:29:12 +0100
Subject: [PATCH 1/3] Add GRADLE_JAVA_HOME into GraalPy dependencies

---
 ci/common.jsonnet | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ci/common.jsonnet b/ci/common.jsonnet
index d2ef2c435725..7ffa08c93e5f 100644
--- a/ci/common.jsonnet
+++ b/ci/common.jsonnet
@@ -203,6 +203,12 @@ local common_json = import "../common.json";
       },
     },
 
+    gradle:: {
+      downloads+: {
+        GRADLE_JAVA_HOME: jdks_data["oraclejdk21"],
+      }
+    },
+
     local code_tools = {
       downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
         TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
@@ -251,7 +257,7 @@ local common_json = import "../common.json";
       } else {},
     },
 
-    graalpy:: {
+    graalpy:: self.gradle + {
       packages+: if (self.os == "linux") then {
         libffi: '>=3.2.1',
         bzip2: '>=1.0.6',

From d2c3109a93700d7d747ccc4d314a45347eed800f Mon Sep 17 00:00:00 2001
From: ol-automation_ww <ol-automation_ww@oracle.com>
Date: Wed, 4 Dec 2024 18:07:37 +0000
Subject: [PATCH 2/3] Update language imports

---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index aacf098280bc..354ea99ed750 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -49,7 +49,7 @@
             },
             {
                 "name": "truffleruby",
-                "version": "817b7b96cd0188294fbfde6ce571fee7b5573b32",
+                "version": "afce3270d46a6d4848ea1c9402f3eba651c02fdb",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},
@@ -65,7 +65,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "cc992337891dc6f2dfe88ebb26691917eb8c09a4",
+                "version": "4f81ad57246716e4113c694170df7627beac5b70",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

From 8187c6d006c3faa27e6195e6849419f57a93ab8f Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Fri, 6 Dec 2024 15:01:33 +0100
Subject: [PATCH 3/3] Update GraalPy import

---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 354ea99ed750..ab58b331f1f4 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -65,7 +65,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "4f81ad57246716e4113c694170df7627beac5b70",
+                "version": "efde0fb6e3807d5bb001baa73c840dce3d292e29",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},