diff options
| author | robot-javacom <robot-javacom@yandex-team.com> | 2024-04-02 15:36:05 +0300 |
|---|---|---|
| committer | robot-javacom <robot-javacom@yandex-team.com> | 2024-04-02 15:54:43 +0300 |
| commit | 2225c7ebd1219c2f75eb57f9d07708eca6ec3719 (patch) | |
| tree | 16e69809395b0776ae2add5a0068778836884364 /build/conf | |
| parent | 98436e6d4a1d133fd7446b9155db93c24801eda5 (diff) | |
| download | ydb-2225c7ebd1219c2f75eb57f9d07708eca6ec3719.tar.gz | |
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/conf')
| -rw-r--r-- | build/conf/java.conf | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 74a260e8ee..fed842aebe 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -413,7 +413,7 @@ when($JDK_VERSION == "8") { } # tag:java-specific -JDK_LATEST_VERSION=21 +JDK_LATEST_VERSION=22 JDK_LATEST_PEERDIR=build/platform/java/jdk/jdk${JDK_LATEST_VERSION} # tag:java-specific @@ -1057,6 +1057,11 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE { JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS } + when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "22") { + JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS + JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS + } + when($ERROR_PRONE_VALUE && $ERROR_PRONE_VERSION == "2.7.1") { JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_7_1_FORCED_OPTS JAVAC_OPTS+=$ERROR_PRONE_2_7_1_FORCED_OPTS @@ -1190,6 +1195,9 @@ JAVA_SWIG_DELIM=JAVA_SWIG_DELIM JDK_REAL_VERSION= JDK_VERSION= +when ($JDK_VERSION == "22") { + JDK_REAL_VERSION=22 +} when ($JDK_VERSION == "21") { JDK_REAL_VERSION=21 } @@ -1224,6 +1232,9 @@ when ($USE_SYSTEM_JDK) { JDK_RESOURCE_PEERDIR= } otherwise { + when ($JDK_REAL_VERSION == "22") { + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk22 build/platform/java/jdk/jdk17 + } when ($JDK_REAL_VERSION == "21") { JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk21 build/platform/java/jdk/jdk17 } @@ -1249,6 +1260,9 @@ otherwise { } # tag:java-specific +when ($JDK_REAL_VERSION == "22") { + UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar22 +} when ($JDK_REAL_VERSION == "21") { UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar21 } @@ -1277,6 +1291,9 @@ when ($USE_SYSTEM_JDK) { JDK_RESOURCE=$USE_SYSTEM_JDK } otherwise { + when ($JDK_REAL_VERSION == "22") { + JDK_RESOURCE=$JDK22_RESOURCE_GLOBAL + } when ($JDK_REAL_VERSION == "21") { JDK_RESOURCE=$JDK21_RESOURCE_GLOBAL } @@ -1333,6 +1350,11 @@ when (!$USE_SYSTEM_ERROR_PRONE) { ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.18.0 ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_18_0_RESOURCE_GLOBAL } + elsewhen ($JDK_REAL_VERSION == "22") { + ERROR_PRONE_VERSION=2.18.0 + ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.18.0 + ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_18_0_RESOURCE_GLOBAL + } otherwise { ERROR_PRONE_VERSION=2.7.1 ERROR_PRONE_PEERDIR=build/platform/java/error_prone @@ -1350,6 +1372,9 @@ when ($USE_SYSTEM_UBERJAR) { UBERJAR_RESOURCE=$USE_SYSTEM_UBERJAR } otherwise { + when ($JDK_REAL_VERSION == "22") { + UBERJAR_RESOURCE=$UBERJAR22_RESOURCE_GLOBAL + } when ($JDK_REAL_VERSION == "21") { UBERJAR_RESOURCE=$UBERJAR21_RESOURCE_GLOBAL } @@ -1374,6 +1399,9 @@ otherwise { } # tag:java-specific +when ($JDK_REAL_VERSION == "22") { + WITH_JDK_RESOURCE=$WITH_JDK22_RESOURCE_GLOBAL +} when ($JDK_REAL_VERSION == "21") { WITH_JDK_RESOURCE=$WITH_JDK21_RESOURCE_GLOBAL } |