summaryrefslogtreecommitdiffstats
path: root/build/platform/java
diff options
context:
space:
mode:
authorpazus <[email protected]>2025-03-25 11:01:46 +0300
committerpazus <[email protected]>2025-03-25 11:26:04 +0300
commitd9a5453f3cf2ca5b9f19f543f49f67e47314203e (patch)
treef38230319012716ab1a50a8cec04bc505386fee5 /build/platform/java
parent5fa31ed90925ed2948f5b3ce6b327db403bdca1c (diff)
Add jdk24 support
commit_hash:3c08964ccb92c46217f9f1ef91ab9b9702ca623f
Diffstat (limited to 'build/platform/java')
-rw-r--r--build/platform/java/jdk/jdk24/jdk.json19
-rw-r--r--build/platform/java/jdk/jdk24/ya.make17
-rw-r--r--build/platform/java/jdk/ya.make4
3 files changed, 40 insertions, 0 deletions
diff --git a/build/platform/java/jdk/jdk24/jdk.json b/build/platform/java/jdk/jdk24/jdk.json
new file mode 100644
index 00000000000..e5e0fd4adef
--- /dev/null
+++ b/build/platform/java/jdk/jdk24/jdk.json
@@ -0,0 +1,19 @@
+{
+ "by_platform": {
+ "darwin-arm64": {
+ "uri": "sbr:8342543231"
+ },
+ "darwin-x86_64": {
+ "uri": "sbr:8342542290"
+ },
+ "linux-x86_64": {
+ "uri": "sbr:8342539438"
+ },
+ "linux-aarch64": {
+ "uri": "sbr:8342540244"
+ },
+ "win32-x86_64": {
+ "uri": "sbr:8342541289"
+ }
+ }
+}
diff --git a/build/platform/java/jdk/jdk24/ya.make b/build/platform/java/jdk/jdk24/ya.make
new file mode 100644
index 00000000000..f35bca5454e
--- /dev/null
+++ b/build/platform/java/jdk/jdk24/ya.make
@@ -0,0 +1,17 @@
+RESOURCES_LIBRARY()
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK24 jdk.json)
+SET_RESOURCE_URI_FROM_JSON(WITH_JDK24_URI jdk.json)
+
+IF (WITH_JDK24_URI)
+ DECLARE_EXTERNAL_RESOURCE(WITH_JDK24 ${WITH_JDK24_URI})
+ENDIF()
+
+END()
+
+IF (AUTOCHECK)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
+IF(YA_IDE_IDEA)
+ RECURSE_FOR_TESTS(ut)
+ENDIF()
diff --git a/build/platform/java/jdk/ya.make b/build/platform/java/jdk/ya.make
index 112b1d9904a..474ffa26a08 100644
--- a/build/platform/java/jdk/ya.make
+++ b/build/platform/java/jdk/ya.make
@@ -3,6 +3,9 @@ RESOURCES_LIBRARY()
# Add new JDK to build/plugins/java.py (2 times)
IF(USE_SYSTEM_JDK)
MESSAGE(WARNING DEFAULT_JDK are disabled)
+ELSEIF(JDK_REAL_VERSION == "24")
+ DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk24/jdk.json)
+ SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk24/jdk.json)
ELSEIF(JDK_REAL_VERSION == "23")
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk23/jdk.json)
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk23/jdk.json)
@@ -38,6 +41,7 @@ RECURSE(
jdk21
jdk22
jdk23
+ jdk24
testing
)