diff options
| author | robot-javacom <[email protected]> | 2024-04-02 15:36:05 +0300 |
|---|---|---|
| committer | robot-javacom <[email protected]> | 2024-04-02 15:54:43 +0300 |
| commit | 2225c7ebd1219c2f75eb57f9d07708eca6ec3719 (patch) | |
| tree | 16e69809395b0776ae2add5a0068778836884364 /build/platform/java | |
| parent | 98436e6d4a1d133fd7446b9155db93c24801eda5 (diff) | |
Upload new jdk-22+36
https://a.yandex-team.ru/projects/committeejava/ci/actions/flow?dir=devtools%2Fcontrib%2Fprepare_jdk&id=prepare-new-pr&number=41
de043a99ab748eeb392faa161c639dbe11a8aff3
Diffstat (limited to 'build/platform/java')
| -rw-r--r-- | build/platform/java/jdk/jdk22/jdk.json | 19 | ||||
| -rw-r--r-- | build/platform/java/jdk/jdk22/ya.make | 17 | ||||
| -rw-r--r-- | build/platform/java/jdk/ya.make | 4 |
3 files changed, 40 insertions, 0 deletions
diff --git a/build/platform/java/jdk/jdk22/jdk.json b/build/platform/java/jdk/jdk22/jdk.json new file mode 100644 index 00000000000..854f39d54f8 --- /dev/null +++ b/build/platform/java/jdk/jdk22/jdk.json @@ -0,0 +1,19 @@ +{ + "by_platform": { + "darwin-arm64": { + "uri": "sbr:6043999575" + }, + "darwin-x86_64": { + "uri": "sbr:6043999100" + }, + "linux-x86_64": { + "uri": "sbr:6043997124" + }, + "linux-aarch64": { + "uri": "sbr:6043997813" + }, + "win32-x86_64": { + "uri": "sbr:6043998448" + } + } +} diff --git a/build/platform/java/jdk/jdk22/ya.make b/build/platform/java/jdk/jdk22/ya.make new file mode 100644 index 00000000000..2c8aebe5138 --- /dev/null +++ b/build/platform/java/jdk/jdk22/ya.make @@ -0,0 +1,17 @@ +RESOURCES_LIBRARY() + +DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK22 jdk.json) +SET_RESOURCE_URI_FROM_JSON(WITH_JDK22_URI jdk.json) + +IF (WITH_JDK22_URI) + DECLARE_EXTERNAL_RESOURCE(WITH_JDK22 ${WITH_JDK22_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 32720280125..17c55396a2b 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 == "22") + DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk22/jdk.json) + SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk22/jdk.json) ELSEIF(JDK_REAL_VERSION == "21") DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk21/jdk.json) SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk21/jdk.json) @@ -42,6 +45,7 @@ RECURSE( jdk18 jdk20 jdk21 + jdk22 testing ) |