Merge branch 'PR'

Author: alexv-smirnov

build/conf/java.conf

@@ -423,6 +423,7 @@ macro _SEM_JAR_SOURCE_SET(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RES
 macro FULL_JAVA_SRCS(Args...) {
     _IDEA_JAVA_SRCS_VALUE($Args)
     _JAVA_SRCS($Args)
+    _SEM_JAR_SOURCE_SET($Args)
 }
 
 # tag:java-specific

build/conf/proto.conf

@@ -511,18 +511,6 @@ macro _JAVA_PROTO_CMD(File) {
     .SEM=proto_files ${input;rootrel:File} ${hide;output:File.jsrc}
 }
 
-
-# tag:proto tag:perl-specific tag:deprecated
-### @usage: XS_PROTO(InputProto Dir Outputs...) # deprecated
-###
-### Generate Perl code from protobuf.
-### In order to use this macro one should predict all outputs protoc will emit from input_proto file and enlist those as outputs.
-macro XS_PROTO(File, Dir, Outputs...) {
-    .CMD=${PROTOC_OLD} -I=${ARCADIA_ROOT}/${Dir} ${pre=-I=:_PROTO__INCLUDE} -I=${ARCADIA_ROOT} -I=${PROTOBUF_OLD_PATH} --perlxs_out=${BINDIR} $_PROTOC_FLAGS ${input:File} ${hide;output:Outputs} ${induced_deps=h+cpp;hide;nopath;noext;suf=.pb.h:File} ${hide:PROTO_FAKEID}
-    PEERDIR(${Dir})
-    ADDINCL(${ARCADIA_BUILD_ROOT}/${Dir})
-}
-
 # tag:proto tag:python-specific
 when ($PY_PROTOS_FOR == "yes") {
     PEERDIR+=contrib/libs/protobuf/python

build/conf/settings.conf

@@ -127,4 +127,3 @@ ARCADIA_TEST_ROOT=../arcadia_tests_data/
 DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
 
 AUTOINCLUDE_PATHS=build/conf/autoincludes.json
-LINTERS_MAKE_FILENAME=linters.make.inc

build/conf/ts/ts_test.conf

@@ -35,7 +35,7 @@ module TS_TEST_JEST_FOR: _TS_TEST_BASE {
     SET(PEERDIR_TAGS TS TS_PROTO TS_PROTO_FROM_SCHEMA)
 
     # compatibility with old TS_TEST_SRCS
-    SET(TS_TEST_EXTENSION test.(ts|tsx|js|jsx))
+    SET(TS_TEST_EXTENSION (test|spec).(ts|tsx|mts|cts|js|jsx|mjs|cjs))
     SET(TS_TEST_EXTRA_SRCS_MASK /**/__mocks__/*)
 
     # nots.py will decide if we need to depend on the testing target module output

build/export_generators/ide-gradle/build.gradle.kts.jinja

@@ -1,14 +1,3 @@
-{%- macro OutDirs(run, prefix, suffix) -%}
-{%-    if run.args|length and run.out_dir|length -%}
-{%-        for out_dir in run.out_dir -%}
-{%-            set out_dirs = select_by_ends(run.args, "/" + out_dir) -%}
-{%-            if out_dirs|length %}
-{{ prefix }}{{ out_dirs|first }}{{ suffix }}
-{%-            endif -%}
-{%-        endfor -%}
-{%-    endif -%}
-{%- endmacro -%}
-
 {%- include "[generator]/vars.jinja" -%}
 {%- include "[generator]/import.jinja" -%}
 {%- include "[generator]/repositories.jinja" -%}

build/export_generators/ide-gradle/generator.toml

@@ -88,4 +88,5 @@ test=[
     "/src/test/java",
     "/src/test-integration",
     "/src/testFixtures",
+    "/src/intTest",
 ]

build/export_generators/ide-gradle/jdk.jinja

@@ -0,0 +1,24 @@
+{#- default JDK version -#}
+{%- set jdk_version = '17' -%}
+{%- if target.required_jdk -%}
+{%-     set jdk_version = target.required_jdk -%}
+{%- elif target.jdk_version -%}
+{%-     set jdk_version = target.jdk_version -%}
+{%- elif not target and extra_targets|length -%}
+{%-     set extra_jdk_version = extra_targets|selectattr('jdk_version')|map(attribute='jdk_version')|first -%}
+{%-     if extra_jdk_version -%}
+{%-         set jdk_version = extra_jdk_version -%}
+{%-     endif -%}
+{%- endif -%}
+
+{%- set jdk_path = false -%}
+{%- if target.jdk_path and target.jdk_path != "NOT_FOUND" -%}
+{%-     set jdk_path = target.jdk_path -%}
+{#- If no main target, but exists extra_targets -#}
+{%- elif not target and extra_targets|length -%}
+{%-     set jdk_path_targets = extra_targets|selectattr('jdk_path')|rejectattr('jdk_path', 'eq', 'NOT_FOUND') -%}
+{%-     if jdk_path_targets|length -%}
+{%-         set jdk_path_target = jdk_path_targets|first -%}
+{%-         set jdk_path = jdk_path_target.jdk_path -%}
+{%-     endif -%}
+{%- endif -%}

build/export_generators/ide-gradle/kotlin_plugins.jinja

@@ -59,6 +59,6 @@ noArg {
 {%- if with_kotlin %}
 
 kotlin {
-    jvmToolchain({{ required_jdk }})
+    jvmToolchain({{ jdk_version }})
 }
 {%  endif -%}

build/export_generators/ide-gradle/plugins.jinja

@@ -35,12 +35,11 @@ plugins {
 {%- endif %}
 }
 
-{#- language level -#}
-{%- if has_required_jdk %}
+{%- if jdk_version %}
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of("{{ required_jdk }}")
+        languageVersion = JavaLanguageVersion.of("{{ jdk_version }}")
     }
 }
-{%- endif -%}
+{%  endif -%}

build/export_generators/ide-gradle/preview.jinja

@@ -3,7 +3,7 @@
 tasks.withType<JavaCompile> {
     options.compilerArgs.add("--enable-preview")
     options.compilerArgs.add("-Xlint:preview")
-    options.release.set({{ required_jdk }})
+    options.release.set({{ jdk_version }})
 }
 
 tasks.withType<JavaExec> {
@@ -17,7 +17,7 @@ tasks.withType<Test> {
 
 tasks.withType<Javadoc> {
     val javadocOptions = options as CoreJavadocOptions
-    javadocOptions.addStringOption("source", "{{ required_jdk }}")
+    javadocOptions.addStringOption("source", "{{ jdk_version }}")
     javadocOptions.addBooleanOption("-enable-preview", true)
 }
 {% endif -%}