summaryrefslogtreecommitdiffstats
path: root/build/platform/java
diff options
context:
space:
mode:
authorrobot-javacom <[email protected]>2026-04-16 09:12:49 +0300
committerrobot-javacom <[email protected]>2026-04-16 09:33:06 +0300
commit9cd8d6c9fb5f560a251959b351bb82a84e3575c7 (patch)
treef766074db1081418bf45012ed086683a4734a150 /build/platform/java
parent7c5a2a1920e2ca043ba6d912bbbae083fdf00602 (diff)
Add Java 26 support to Arcadia
Support Java 26 in build/test/uberjar packaging in ya.make <https://nda.ya.ru/t/KrSYyO6u7ZafNd> commit_hash:3a488935d6801a40d6781e73db65507d563e5eac
Diffstat (limited to 'build/platform/java')
-rw-r--r--build/platform/java/jdk/jdk26/jdk.json19
-rw-r--r--build/platform/java/jdk/jdk26/ya.make20
-rw-r--r--build/platform/java/jdk/ya.make4
3 files changed, 43 insertions, 0 deletions
diff --git a/build/platform/java/jdk/jdk26/jdk.json b/build/platform/java/jdk/jdk26/jdk.json
new file mode 100644
index 00000000000..33cd5846d56
--- /dev/null
+++ b/build/platform/java/jdk/jdk26/jdk.json
@@ -0,0 +1,19 @@
+{
+ "by_platform": {
+ "darwin-arm64": {
+ "uri": "sbr:11732431593"
+ },
+ "darwin-x86_64": {
+ "uri": "sbr:11732428476"
+ },
+ "linux-x86_64": {
+ "uri": "sbr:11732420006"
+ },
+ "linux-aarch64": {
+ "uri": "sbr:11732423174"
+ },
+ "win32-x86_64": {
+ "uri": "sbr:11732425636"
+ }
+ }
+}
diff --git a/build/platform/java/jdk/jdk26/ya.make b/build/platform/java/jdk/jdk26/ya.make
new file mode 100644
index 00000000000..d3ee685ad0c
--- /dev/null
+++ b/build/platform/java/jdk/jdk26/ya.make
@@ -0,0 +1,20 @@
+RESOURCES_LIBRARY()
+
+TOOLCHAIN(JDK)
+VERSION(26.0.2+10)
+
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK26 jdk.json)
+SET_RESOURCE_URI_FROM_JSON(WITH_JDK26_URI jdk.json)
+
+IF (WITH_JDK26_URI)
+ DECLARE_EXTERNAL_RESOURCE(WITH_JDK26 ${WITH_JDK26_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 aec876b2974..5704676dbae 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 == "26")
+ DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk26/jdk.json)
+ SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk26/jdk.json)
ELSEIF(JDK_REAL_VERSION == "25")
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk25/jdk.json)
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk25/jdk.json)
@@ -42,6 +45,7 @@ RECURSE(
jdk23
jdk24
jdk25
+ jdk26
testing
)