Skip to content

Commit a7cac42

Browse files
alexv-smirnovalexv-smirnov
committed
Merge branch 'rightlib' into mergelibs-241122-0919
2 parents a18f18d + 9478cfd commit a7cac42

File tree

1,328 files changed

+11265
-4751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,328 files changed

+11265
-4751
lines changed

‎build/config/tests/flake8/flake8.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ ignore =
285285
PLR915,
286286
# too-many-boolean-expressions
287287
PLR916,
288+
# too-many-positional-arguments
289+
PLR917,
288290
# consider-merging-isinstance
289291
PLR701,
290292
# too-many-nested-blocks

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

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,6 @@ subprojects {
3838
{%- endif %}
3939

4040
plugins {
41-
{#- some plugins configuration -#}
42-
{%- for library in target.consumer if library.classpath -%}
43-
{#- error prone plugin configuration -#}
44-
{%- if library.prebuilt and library.jar and (library.type != "contrib" or build_contribs) and "contrib/java/com/google/errorprone/error_prone_annotations/" in library.jar -%}
45-
46-
id("net.ltgt.errorprone") version "{{ errorprone_plugin_version }}"
47-
48-
{%- endif -%}
49-
{%- endfor -%}
50-
51-
{#- lombok configuration -#}
52-
{#- TODO remove usings annotation_processors semantic -#}
53-
{%- if ("lombok.launch.AnnotationProcessorHider$AnnotationProcessor" in target.annotation_processors) or (target.use_annotation_processor|length and target.use_annotation_processor|select('startsWith', 'contrib/java/org/projectlombok/lombok')|length) %}
54-
id("io.freefair.lombok") version "8.6"
55-
{%- endif -%}
5641
{%- if mainClass %}
5742
`application`
5843
{%- else %}
@@ -76,6 +61,17 @@ plugins {
7661
{%- if target.with_kotlinc_plugin_serialization|length %}
7762
kotlin("plugin.serialization") version "{{ kotlin_version }}"
7863
{% endif -%}
64+
{%- endif -%}
65+
66+
{#- errorprone plugin configuration -#}
67+
{%- if target.consumer|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length %}
68+
id("net.ltgt.errorprone") version "{{ errorprone_plugin_version }}"
69+
{%- endif -%}
70+
71+
{#- lombok plugin configuration -#}
72+
{#- TODO remove usings annotation_processors semantic -#}
73+
{%- if ("lombok.launch.AnnotationProcessorHider$AnnotationProcessor" in target.annotation_processors) or (target.use_annotation_processor|length and target.use_annotation_processor|select('startsWith', 'contrib/java/org/projectlombok/lombok')|length) %}
74+
id("io.freefair.lombok") version "8.6"
7975
{%- endif %}
8076
}
8177

@@ -272,6 +268,7 @@ sourceSets.main.java.srcDirs += "{{ srcdir_glob[0] }}"
272268
{%- endfor -%}
273269

274270
sourceSets {
271+
{%- if target.runs|length %}
275272
main {
276273
{#-
277274
Default by Gradle:
@@ -280,13 +277,11 @@ sourceSets {
280277
resources.srcDir("src/main/resources")
281278
282279
#}
283-
{%- if target.runs|length -%}
284280
{%- for run in target.runs -%}
285281
{{ OutDirs(run, ' java.srcDir("', '")') }}
286-
{%- endfor -%}
287-
{%- endif %}
282+
{%- endfor %}
288283
}
289-
284+
{%- endif %}
290285
test {
291286
{#-
292287
Default by Gradle:
@@ -315,11 +310,9 @@ sourceSets {
315310

316311
dependencies {
317312
{%- for library in target.consumer if library.classpath -%}
318-
{# error prone plugin configuration #}
319-
{%- if library.prebuilt and library.jar and (library.type != "contrib" or build_contribs) and "contrib/java/com/google/errorprone/error_prone_annotations" in library.jar -%}
320-
{% set errorprone_version = library.jar -%}
321-
{% set errorprone_parts = errorprone_version|replace("contrib/java/com/google/errorprone/error_prone_annotations/") -%}
322-
{% set errorprone_parts = split(errorprone_parts, '/') %}
313+
{%- if library.prebuilt and (library.type != "contrib" or build_contribs) and ("contrib/java/com/google/errorprone/error_prone_annotations" in library.jar) -%}
314+
{%- set errorprone_version = library.jar|replace("contrib/java/com/google/errorprone/error_prone_annotations/", "") -%}
315+
{%- set errorprone_parts = split(errorprone_version, '/', 2) %}
323316
errorprone("com.google.errorprone:error_prone_core:{{ errorprone_parts[0] }}")
324317
{%- endif -%}
325318

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

Lines changed: 53 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{%- set publish = target.publish -%}
2+
{%- set libraries = target.consumer|selectattr('type', 'eq', 'library') -%}
3+
24
import com.google.protobuf.gradle.*
35

46
val baseBuildDir = "{{ export_root }}/gradle.build/"
@@ -7,7 +9,10 @@ subprojects {
79
buildDir = file(baseBuildDir + project.path.replaceFirst(":", "/").replace(":", "."))
810
}
911

10-
val buildProtoDir = File("${buildDir}", "__proto__")
12+
val mainProtosDir = File(buildDir, "main_protos")
13+
{%- if libraries|length %}
14+
val mainExtractedIncludeProtosDir = File(buildDir, "extracted-include-protos/main")
15+
{%- endif %}
1116

1217
plugins {
1318
id("java-library")
@@ -37,14 +42,23 @@ repositories {
3742
}
3843
}
3944

45+
val project_root = "{{ arcadia_root }}"
46+
4047
sourceSets {
4148
main {
42-
java.srcDir("build/generated/source/proto")
49+
java.srcDir("$buildDir/generated/sources/proto/main/java")
50+
{%- if target.proto_grpc %}
51+
java.srcDir("$buildDir/generated/sources/proto/main/grpc")
52+
{%- endif %}
53+
}
54+
test {
55+
java.srcDir("$buildDir/generated/sources/proto/test/java")
56+
{%- if target.proto_grpc %}
57+
java.srcDir("$buildDir/generated/sources/proto/test/grpc")
58+
{%- endif %}
4359
}
4460
}
4561

46-
val project_root = "{{ arcadia_root }}"
47-
4862
java {
4963
withSourcesJar()
5064
withJavadocJar()
@@ -92,21 +106,24 @@ dependencies {
92106
}
93107
{%- endif -%}
94108
{%- endif -%}
95-
{%- endfor %}
109+
{%- endfor -%}
96110

97111
{%- if target.proto_namespace %}
98-
protobuf(files(File(buildProtoDir, "{{ target.proto_namespace }}")))
112+
protobuf(files(File(mainProtosDir, "{{ target.proto_namespace }}")))
99113
{%- else %}
100-
protobuf(files(buildProtoDir))
114+
protobuf(files(mainProtosDir))
101115
{%- endif %}
102116
}
103117

104118
protobuf {
119+
generatedFilesBaseDir = "$buildDir/generated/sources/proto"
120+
105121
protoc {
106122
// Download from repositories
107123
artifact = "com.google.protobuf:protoc:{%- if target.proto_compiler_version -%}{{ target.proto_compiler_version }}{%- else -%}3.22.5{%- endif -%}"
108124
}
109-
{% if target.proto_grpc -%}
125+
{%- if target.proto_grpc %}
126+
110127
plugins {
111128
id("grpc") {
112129
artifact = "io.grpc:protoc-gen-grpc-java:{%- if target.proto_grpc_version -%}{{ target.proto_grpc_version }}{%- else -%}1.45.0{%- endif -%}"
@@ -115,48 +132,57 @@ protobuf {
115132
id("grpckt") {
116133
artifact = "io.grpc:protoc-gen-grpc-kotlin:{%- if target.proto_kotlin_grpc_version -%}{{ target.proto_kotlin_grpc_version }}{%- else -%}1.3.1{%- endif -%}:jdk8@jar"
117134
}
118-
{% endif -%}
135+
{%- endif %}
119136
}
137+
120138
generateProtoTasks {
121139
all().forEach {
122140
it.plugins {
123141
id("grpc")
124142
{%- if target.proto_kotlin_grpc %}
125143
id("grpckt")
126-
{% endif -%}
144+
{%- endif %}
127145
}
128146
{%- if target.proto_kotlin_grpc %}
129147
it.builtins {
130148
create("kotlin")
131149
}
132-
{% endif -%}
150+
{%- endif %}
133151
}
134152
}
135153
{%- endif %}
136154
}
137155

138-
val prepareProto = tasks.register<Copy>("prepareProto") {
139-
from(rootDir) {
140-
{%- for proto in target.proto_files %}
141-
include("{{ proto }}")
142-
{%- endfor %}
143-
{# Mining proto-deps sources directories #}
144-
{%- for library in target.consumer if library.prebuilt -%}
145-
{%- if library.type == "library" %}
146-
{%- set proto_rep = library.classpath|replace('project(":','') %}
147-
{%- set proto_rep = proto_rep|replace('")','') %}
148-
{%- set proto_rep = proto_rep|replace(':','/') %}
149-
{%- set proto = proto_rep + '/**' %}
156+
val prepareMainProtos = tasks.register<Copy>("prepareMainProtos") {
157+
from("$project_root") {
158+
{#- list of all current project proto files -#}
159+
{%- for proto in target.proto_files %}
150160
include("{{ proto }}")
151-
{%- endif -%}
152-
{%- endfor %}
161+
{%- endfor %}
153162
}
154-
into(buildProtoDir)
163+
into(mainProtosDir)
155164
}
156165

166+
{% if libraries|length -%}
167+
val extractMainLibrariesProtos = tasks.register<Copy>("extractMainLibrariesProtos") {
168+
from("$project_root") {
169+
{#- list of all library directories -#}
170+
{%- for library in libraries -%}
171+
{%- set path_and_jar = rsplit(library.jar, '/', 2) %}
172+
include("{{ path_and_jar[0] }}/**/*.proto")
173+
{%- endfor %}
174+
}
175+
into(mainExtractedIncludeProtosDir)
176+
}
177+
178+
{% endif -%}
157179
afterEvaluate {
158-
tasks.getByName("extractProto").dependsOn(prepareProto)
180+
tasks.getByName("extractProto").dependsOn(prepareMainProtos)
181+
{%- if libraries|length %}
182+
tasks.getByName("extractProto").dependsOn(extractMainLibrariesProtos)
183+
{%- endif %}
159184
}
185+
160186
{# To avoid problems when build project with proto #}
161187
tasks.getByName("sourcesJar").dependsOn("generateProto")
162188

‎build/external_resources/flake8_py3/ya.make

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ENDIF()
1212

1313
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
1414
FLAKE8_PY3
15-
sbr:6822862832 FOR DARWIN-ARM64
16-
sbr:6822863322 FOR DARWIN
15+
sbr:7501315930 FOR DARWIN-ARM64
16+
sbr:7501316202 FOR DARWIN
1717
sbr:6726869647 FOR LINUX-PPC64LE
18-
sbr:6822864509 FOR LINUX
19-
sbr:6822862341 FOR LINUX-AARCH64
20-
sbr:6822864007 FOR WIN32
18+
sbr:7501316756 FOR LINUX
19+
sbr:7501315620 FOR LINUX-AARCH64
20+
sbr:7501316414 FOR WIN32
2121
)
2222

2323
END()

‎build/mapping.conf.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,24 +293,28 @@
293293
"6726871384": "https://devtools-registry.s3.yandex.net/6726871384",
294294
"6760720465": "https://devtools-registry.s3.yandex.net/6760720465",
295295
"6822863322": "https://devtools-registry.s3.yandex.net/6822863322",
296+
"7501316202": "https://devtools-registry.s3.yandex.net/7501316202",
296297
"6603781997": "https://devtools-registry.s3.yandex.net/6603781997",
297298
"6652223452": "https://devtools-registry.s3.yandex.net/6652223452",
298299
"6674733966": "https://devtools-registry.s3.yandex.net/6674733966",
299300
"6726867988": "https://devtools-registry.s3.yandex.net/6726867988",
300301
"6760720256": "https://devtools-registry.s3.yandex.net/6760720256",
301302
"6822862832": "https://devtools-registry.s3.yandex.net/6822862832",
303+
"7501315930": "https://devtools-registry.s3.yandex.net/7501315930",
302304
"6603787904": "https://devtools-registry.s3.yandex.net/6603787904",
303305
"6652225714": "https://devtools-registry.s3.yandex.net/6652225714",
304306
"6674734993": "https://devtools-registry.s3.yandex.net/6674734993",
305307
"6726875537": "https://devtools-registry.s3.yandex.net/6726875537",
306308
"6760721014": "https://devtools-registry.s3.yandex.net/6760721014",
307309
"6822864509": "https://devtools-registry.s3.yandex.net/6822864509",
310+
"7501316756": "https://devtools-registry.s3.yandex.net/7501316756",
308311
"6603780916": "https://devtools-registry.s3.yandex.net/6603780916",
309312
"6652222817": "https://devtools-registry.s3.yandex.net/6652222817",
310313
"6674733653": "https://devtools-registry.s3.yandex.net/6674733653",
311314
"6726866588": "https://devtools-registry.s3.yandex.net/6726866588",
312315
"6760720046": "https://devtools-registry.s3.yandex.net/6760720046",
313316
"6822862341": "https://devtools-registry.s3.yandex.net/6822862341",
317+
"7501315620": "https://devtools-registry.s3.yandex.net/7501315620",
314318
"6603783079": "https://devtools-registry.s3.yandex.net/6603783079",
315319
"6652224021": "https://devtools-registry.s3.yandex.net/6652224021",
316320
"6674734285": "https://devtools-registry.s3.yandex.net/6674734285",
@@ -321,6 +325,7 @@
321325
"6726873745": "https://devtools-registry.s3.yandex.net/6726873745",
322326
"6760720811": "https://devtools-registry.s3.yandex.net/6760720811",
323327
"6822864007": "https://devtools-registry.s3.yandex.net/6822864007",
328+
"7501316414": "https://devtools-registry.s3.yandex.net/7501316414",
324329
"3961412335": "https://devtools-registry.s3.yandex.net/3961412335",
325330
"3961411314": "https://devtools-registry.s3.yandex.net/3961411314",
326331
"3961413236": "https://devtools-registry.s3.yandex.net/3961413236",
@@ -906,7 +911,10 @@
906911
"6990860705": "https://devtools-registry.s3.yandex.net/6990860705",
907912
"6990881789": "https://devtools-registry.s3.yandex.net/6990881789",
908913
"7324461836": "https://devtools-registry.s3.yandex.net/7324461836",
914+
"7512107516": "https://devtools-registry.s3.yandex.net/7512107516",
909915
"7193803465": "https://devtools-registry.s3.yandex.net/7193803465",
916+
"7512042091": "https://devtools-registry.s3.yandex.net/7512042091",
917+
"7512103615": "https://devtools-registry.s3.yandex.net/7512103615",
910918
"7324464594": "https://devtools-registry.s3.yandex.net/7324464594",
911919
"7487656957": "https://devtools-registry.s3.yandex.net/7487656957",
912920
"7458707245": "https://devtools-registry.s3.yandex.net/7458707245",
@@ -1037,6 +1045,11 @@
10371045
"7451466407": "https://devtools-registry.s3.yandex.net/7451466407",
10381046
"7407150115": "https://devtools-registry.s3.yandex.net/7407150115",
10391047
"7451406900": "https://devtools-registry.s3.yandex.net/7451406900",
1048+
"7494722271": "https://devtools-registry.s3.yandex.net/7494722271",
1049+
"7494597813": "https://devtools-registry.s3.yandex.net/7494597813",
1050+
"7495431598": "https://devtools-registry.s3.yandex.net/7495431598",
1051+
"7495332394": "https://devtools-registry.s3.yandex.net/7495332394",
1052+
"7495957585": "https://devtools-registry.s3.yandex.net/7495957585",
10401053
"6048579718": "https://devtools-registry.s3.yandex.net/6048579718",
10411054
"2980468199": "https://devtools-registry.s3.yandex.net/2980468199",
10421055
"5562224408": "https://devtools-registry.s3.yandex.net/5562224408"
@@ -1334,24 +1347,28 @@
13341347
"6726871384": "devtools/ya/test/programs/flake8/flake8 for darwin",
13351348
"6760720465": "devtools/ya/test/programs/flake8/flake8 for darwin",
13361349
"6822863322": "devtools/ya/test/programs/flake8/flake8 for darwin",
1350+
"7501316202": "devtools/ya/test/programs/flake8/flake8 for darwin",
13371351
"6603781997": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
13381352
"6652223452": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
13391353
"6674733966": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
13401354
"6726867988": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
13411355
"6760720256": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
13421356
"6822862832": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
1357+
"7501315930": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
13431358
"6603787904": "devtools/ya/test/programs/flake8/flake8 for linux",
13441359
"6652225714": "devtools/ya/test/programs/flake8/flake8 for linux",
13451360
"6674734993": "devtools/ya/test/programs/flake8/flake8 for linux",
13461361
"6726875537": "devtools/ya/test/programs/flake8/flake8 for linux",
13471362
"6760721014": "devtools/ya/test/programs/flake8/flake8 for linux",
13481363
"6822864509": "devtools/ya/test/programs/flake8/flake8 for linux",
1364+
"7501316756": "devtools/ya/test/programs/flake8/flake8 for linux",
13491365
"6603780916": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
13501366
"6652222817": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
13511367
"6674733653": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
13521368
"6726866588": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
13531369
"6760720046": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
13541370
"6822862341": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
1371+
"7501315620": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
13551372
"6603783079": "devtools/ya/test/programs/flake8/flake8 for linux-ppc64le",
13561373
"6652224021": "devtools/ya/test/programs/flake8/flake8 for linux-ppc64le",
13571374
"6674734285": "devtools/ya/test/programs/flake8/flake8 for linux-ppc64le",
@@ -1362,6 +1379,7 @@
13621379
"6726873745": "devtools/ya/test/programs/flake8/flake8 for win32",
13631380
"6760720811": "devtools/ya/test/programs/flake8/flake8 for win32",
13641381
"6822864007": "devtools/ya/test/programs/flake8/flake8 for win32",
1382+
"7501316414": "devtools/ya/test/programs/flake8/flake8 for win32",
13651383
"3961412335": "devtools/ya/test/programs/flake8/py2/flake8 for darwin",
13661384
"3961411314": "devtools/ya/test/programs/flake8/py2/flake8 for darwin-arm64",
13671385
"3961413236": "devtools/ya/test/programs/flake8/py2/flake8 for linux",
@@ -1947,7 +1965,10 @@
19471965
"6990860705": "none-none-none-sandbox/backup/d386643e-58f8-43e1-8760-341d73801df8/yfm-docs.tar",
19481966
"6990881789": "none-none-none-sandbox/backup/efc428e5-52a5-4a6f-8f0c-53f1d255efea/yfm-docs.tar",
19491967
"7324461836": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/0541e185-8261-4b07-9149-257f03a9c8ae/yfm-docs.tar",
1968+
"7512107516": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/0ae16953-fe8d-4f1b-9a76-137110f40faf/yfm-docs.tar",
19501969
"7193803465": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/17df2ad2-24bc-49e8-8909-b58685dac393/yfm-docs.tar",
1970+
"7512042091": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/203a60f0-6d4d-46bf-93eb-a2a5f998b768/yfm-docs.tar",
1971+
"7512103615": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/29fcd2aa-e0b5-481e-83c8-b7ff5e0157c9/yfm-docs.tar",
19511972
"7324464594": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/32cc8c74-decd-44a8-bc8c-f8f0d7edfffe/yfm-docs.tar",
19521973
"7487656957": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/4b747fb6-2d4e-4a7b-bbed-abb9a1e21761/yfm-docs.tar",
19531974
"7458707245": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/4e7df89f-3762-4eba-ba73-562ccaeae548/yfm-docs.tar",
@@ -2078,6 +2099,11 @@
20782099
"7451466407": "ynd-clang-18-optimized-linux-x86_64-c66062833fd14752a7ad8fbfb8f25f370b097278",
20792100
"7407150115": "ynd-clang-18-optimized-mingw-w64-x86_64-56872a411472c7ec2b09f2c8372ea4c67d069a5b",
20802101
"7451406900": "ynd-clang-18-optimized-mingw-w64-x86_64-c66062833fd14752a7ad8fbfb8f25f370b097278",
2102+
"7494722271": "ynd-clang-format-18-darwin-arm64-d0b9255e235e80974f9dfd0ebff3850929bed981",
2103+
"7494597813": "ynd-clang-format-18-darwin-x86_64-d0b9255e235e80974f9dfd0ebff3850929bed981",
2104+
"7495431598": "ynd-clang-format-18-linux-aarch64-d0b9255e235e80974f9dfd0ebff3850929bed981",
2105+
"7495332394": "ynd-clang-format-18-linux-x86_64-d0b9255e235e80974f9dfd0ebff3850929bed981",
2106+
"7495957585": "ynd-clang-format-18-mingw-w64-x86_64-d0b9255e235e80974f9dfd0ebff3850929bed981",
20812107
"6048579718": "yt/go/ytrecipe/cmd/ytexec for linux",
20822108
"2980468199": "ytexec for linux",
20832109
"5562224408": "ytexec for linux"

‎build/platform/yfm/ya.make

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ENDIF()
66

77
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
88
YFM_TOOL
9-
sbr:7487672728 FOR DARWIN-ARM64
10-
sbr:7487672728 FOR DARWIN
11-
sbr:7487632536 FOR LINUX
12-
sbr:7487656957 FOR WIN32
9+
sbr:7512103615 FOR DARWIN-ARM64
10+
sbr:7512103615 FOR DARWIN
11+
sbr:7512042091 FOR LINUX
12+
sbr:7512107516 FOR WIN32
1313
)
1414

1515
END()

0 commit comments

Comments
 (0)