Merge branch 'rightlib' into merge-libs-250507-0050

8 files changed, 50 insertions, 42 deletions

diff --git a/build/export_generators/ide-gradle/codegen.jinja b/build/export_generators/ide-gradle/codegen.jinja
index 4df2ad85a59..951fc4b5ad1 100644
--- a/build/export_generators/ide-gradle/codegen.jinja
+++ b/build/export_generators/ide-gradle/codegen.jinja
@@ -13,6 +13,10 @@ tasks.compileJava.configure {
 tasks.compileTestJava.configure {
     dependsOn({{ taskvar }})
 }
+{%-     if current_target.use_annotation_processor|select('startsWith', 'contrib/java/org/projectlombok/lombok')|length %}
+tasks.getByName("delombok").mustRunAfter({{ taskvar }})
+{%-     endif -%}
+
 {%-     if with_kotlin -%}
 {#-         Check main target codegen -#}
 {%-         if varprefix == "codegen" %}
diff --git a/build/export_generators/ide-gradle/dependencies.jinja b/build/export_generators/ide-gradle/dependencies.jinja
index 3e89198b5f8..0500f7f5fba 100644
--- a/build/export_generators/ide-gradle/dependencies.jinja
+++ b/build/export_generators/ide-gradle/dependencies.jinja
@@ -38,7 +38,7 @@
 {%-             else %}
     {{ apiFunc }}({{ classpath }})
 {%-             endif -%}
-{%-             if library.excludes.consumer|length -%} {
+{%-             if library.excludes.consumer|length and not build_contribs -%} {
 {%-                 for exclude in library.excludes.consumer if exclude.classpath -%}
 {%-                     set classpath = exclude.classpath|replace('"','') -%}
 {%-                     set classpath_parts = split(classpath, ':') -%}
diff --git a/build/export_generators/ide-gradle/source_sets.jinja b/build/export_generators/ide-gradle/source_sets.jinja
index a0086568b6f..a5f81c89a44 100644
--- a/build/export_generators/ide-gradle/source_sets.jinja
+++ b/build/export_generators/ide-gradle/source_sets.jinja
@@ -1,46 +1,39 @@
 {#- empty string #}
 sourceSets {
-{%- set target_jar_source_set = target.jar_source_set|reject('startsWith', 'src/main/java:')|unique -%}
-{%- set target_jar_resource_set = target.jar_resource_set|reject('startsWith', 'src/main/resources:')|unique -%}
-{%- if proto_template or target_jar_source_set|length or target_jar_resource_set|length %}
     main {
-        {#-
-            Default by Gradle:
-
-            java.srcDir("src/main/java")
-            resources.srcDir("src/main/resources")
+        java.srcDir("src/main/java")
+        resources.srcDir("src/main/resources")
 
-        #}
-{%-     if target_jar_source_set|length -%}
-{%-         for source_set in target_jar_source_set -%}
-{%-             set srcdir_glob = split(source_set, ':') -%}
-{%-             set srcdir = srcdir_glob[0] %}
+{%- set target_jar_source_set = target.jar_source_set|reject('startsWith', 'src/main/java:')|unique -%}
+{%- if target_jar_source_set|length -%}
+{%-     for source_set in target_jar_source_set -%}
+{%-         set srcdir_glob = split(source_set, ':') -%}
+{%-         set srcdir = srcdir_glob[0] %}
         java.srcDir({{ PatchRoots(srcdir) }})
-{%-         endfor -%}
-{%-     endif %}
-{%-     if target_jar_resource_set|length -%}
-{%-         for resource_set in target_jar_resource_set -%}
-{%-             set resdir_glob = split(resource_set, ':') -%}
-{%-             set resdir = resdir_glob[0] %}
+{%-     endfor -%}
+{%- endif %}
+
+{%- set target_jar_resource_set = target.jar_resource_set|reject('startsWith', 'src/main/resources:')|unique -%}
+{%- if target_jar_resource_set|length -%}
+{%-     for resource_set in target_jar_resource_set -%}
+{%-         set resdir_glob = split(resource_set, ':') -%}
+{%-         set resdir = resdir_glob[0] %}
         resources.srcDir({{ PatchRoots(resdir) }})
-{%-         endfor -%}
-{%-     endif -%}
-{%-     if proto_template %}
+{%-     endfor -%}
+{%- endif -%}
+
+{%- if proto_template %}
         java.srcDir("$buildDir/generated/source/proto/main/java")
-{%-         if target.proto_grpc %}
+{%-     if target.proto_grpc %}
         java.srcDir("$buildDir/generated/source/proto/main/grpc")
-{%-         endif %}
 {%-     endif %}
-    }
 {%- endif %}
-    test {
-        {#-
-            Default by Gradle:
+    }
 
-            java.srcDir("src/test/java")
-            resources.srcDir("src/test/resources")
+    test {
+        java.srcDir("src/test/java")
+        resources.srcDir("src/test/resources")
 
-        #}
 {%- if proto_template %}
         java.srcDir("$buildDir/generated/source/proto/test/java")
 {%-     if target.proto_grpc %}
@@ -84,3 +77,7 @@ sourceSets {
 tasks.withType<Jar>() {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
+
+tasks.withType<Copy>() {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
diff --git a/build/external_resources/yexport/public.resources.json b/build/external_resources/yexport/public.resources.json
index 02b4f3014ee..895e689e761 100644
--- a/build/external_resources/yexport/public.resources.json
+++ b/build/external_resources/yexport/public.resources.json
@@ -1,13 +1,13 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:8632444017"
+            "uri": "sbr:8661633603"
         },
         "darwin-arm64": {
-            "uri": "sbr:8632441113"
+            "uri": "sbr:8661630683"
         },
         "linux": {
-            "uri": "sbr:8632437510"
+            "uri": "sbr:8661627954"
         }
     }
 }
diff --git a/build/external_resources/yexport/resources.json b/build/external_resources/yexport/resources.json
index b29b46e18cf..149b9f90efb 100644
--- a/build/external_resources/yexport/resources.json
+++ b/build/external_resources/yexport/resources.json
@@ -1,13 +1,13 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:8632348873"
+            "uri": "sbr:8661569123"
         },
         "darwin-arm64": {
-            "uri": "sbr:8632345760"
+            "uri": "sbr:8661565983"
         },
         "linux": {
-            "uri": "sbr:8632343302"
+            "uri": "sbr:8661563169"
         }
     }
 }
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 19ad3a545d3..f355753909b 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -613,6 +613,7 @@
         "8477042967": "{registry_endpoint}/8477042967",
         "8628672485": "{registry_endpoint}/8628672485",
         "8632444017": "{registry_endpoint}/8632444017",
+        "8661633603": "{registry_endpoint}/8661633603",
         "5811823398": "{registry_endpoint}/5811823398",
         "5840611310": "{registry_endpoint}/5840611310",
         "5860185593": "{registry_endpoint}/5860185593",
@@ -645,6 +646,7 @@
         "8477040717": "{registry_endpoint}/8477040717",
         "8628670306": "{registry_endpoint}/8628670306",
         "8632441113": "{registry_endpoint}/8632441113",
+        "8661630683": "{registry_endpoint}/8661630683",
         "5811822876": "{registry_endpoint}/5811822876",
         "5840610640": "{registry_endpoint}/5840610640",
         "5860184285": "{registry_endpoint}/5860184285",
@@ -677,6 +679,7 @@
         "8477038461": "{registry_endpoint}/8477038461",
         "8628668563": "{registry_endpoint}/8628668563",
         "8632437510": "{registry_endpoint}/8632437510",
+        "8661627954": "{registry_endpoint}/8661627954",
         "5766172292": "{registry_endpoint}/5766172292",
         "5805431504": "{registry_endpoint}/5805431504",
         "5829027626": "{registry_endpoint}/5829027626",
@@ -2005,6 +2008,7 @@
         "8477042967": "devtools/yexport/bin/yexport for darwin",
         "8628672485": "devtools/yexport/bin/yexport for darwin",
         "8632444017": "devtools/yexport/bin/yexport for darwin",
+        "8661633603": "devtools/yexport/bin/yexport for darwin",
         "5811823398": "devtools/yexport/bin/yexport for darwin-arm64",
         "5840611310": "devtools/yexport/bin/yexport for darwin-arm64",
         "5860185593": "devtools/yexport/bin/yexport for darwin-arm64",
@@ -2037,6 +2041,7 @@
         "8477040717": "devtools/yexport/bin/yexport for darwin-arm64",
         "8628670306": "devtools/yexport/bin/yexport for darwin-arm64",
         "8632441113": "devtools/yexport/bin/yexport for darwin-arm64",
+        "8661630683": "devtools/yexport/bin/yexport for darwin-arm64",
         "5811822876": "devtools/yexport/bin/yexport for linux",
         "5840610640": "devtools/yexport/bin/yexport for linux",
         "5860184285": "devtools/yexport/bin/yexport for linux",
@@ -2069,6 +2074,7 @@
         "8477038461": "devtools/yexport/bin/yexport for linux",
         "8628668563": "devtools/yexport/bin/yexport for linux",
         "8632437510": "devtools/yexport/bin/yexport for linux",
+        "8661627954": "devtools/yexport/bin/yexport for linux",
         "5766172292": "devtools/ymake/bin/ymake for darwin",
         "5805431504": "devtools/ymake/bin/ymake for darwin",
         "5829027626": "devtools/ymake/bin/ymake for darwin",
diff --git a/build/platform/yfm/resources.json b/build/platform/yfm/resources.json
index c15491ce634..5c5fbdf5dc1 100644
--- a/build/platform/yfm/resources.json
+++ b/build/platform/yfm/resources.json
@@ -1,16 +1,16 @@
 {
     "by_platform": {
         "win32-x86_64": {
-            "uri": "sbr:8476056065"
+            "uri": "sbr:8662891942"
         },
         "darwin-x86_64": {
-            "uri": "sbr:8476054671"
+            "uri": "sbr:8662887844"
         },
         "linux-x86_64": {
-            "uri": "sbr:8476053254"
+            "uri": "sbr:8662885224"
         },
         "darwin-arm64": {
-            "uri": "sbr:8476054671"
+            "uri": "sbr:8662887844"
         }
     }
 }
diff --git a/build/sysincl/intrinsic.yml b/build/sysincl/intrinsic.yml
index 93e944240c8..e0ba97706cb 100644
--- a/build/sysincl/intrinsic.yml
+++ b/build/sysincl/intrinsic.yml
@@ -55,6 +55,7 @@
   - tbmintrin.h
   - tmmintrin.h
   - varargs.h
+  - wasm_simd128.h
   - wmmintrin.h
   - x86intrin.h
   - xmmintrin.h