Minimize deps by unique, exclude deps from test deps

Minimize deps by unique, exclude deps from test deps
commit_hash:7cb7ac6eb6333713ac5ad55f17eec8a420a6ad8d

1 files changed, 11 insertions, 9 deletions

diff --git a/build/export_generators/ide-gradle/dependencies.jinja b/build/export_generators/ide-gradle/dependencies.jinja
index deb64a4ee7f..3e89198b5f8 100644
--- a/build/export_generators/ide-gradle/dependencies.jinja
+++ b/build/export_generators/ide-gradle/dependencies.jinja
@@ -13,9 +13,9 @@
 {%-     endif -%}
 {%- endmacro -%}
 
-{%- macro AddFileDeps(file_deps) -%}
-{%-     for file_dep in file_deps %}
-        "$arcadia_root/{{ file_dep.jar }}"{%- if not loop.last -%},{%- endif -%}
+{%- macro AddFileJars(file_jars) -%}
+{%-     for file_jar in file_jars %}
+        "$arcadia_root/{{ file_jar }}"{%- if not loop.last -%},{%- endif -%}
 {%-     endfor -%}
 {%- endmacro -%}
 
@@ -56,13 +56,15 @@
 {%- if not build_contribs -%}
 {%-     set file_deps = file_deps|selectattr('type', 'ne', 'contrib') -%}
 {%- endif -%}
-{%- set file_classpaths = file_deps|map(attribute='classpath') -%}
+{%- set file_classpaths = file_deps|map(attribute='classpath')|unique|sort -%}
+{%- set file_jars = file_deps|map(attribute='jar')|unique|sort -%}
 
 {%- set test_file_deps = extra_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('classpath')|selectattr('jar')|selectattr('prebuilt', 'eq', true) -%}
 {%- if not build_contribs -%}
 {%-     set test_file_deps = test_file_deps|selectattr('type', 'ne', 'contrib') -%}
 {%- endif -%}
-{%- set test_file_classpaths = test_file_deps|map(attribute='classpath') -%}
+{%- set test_file_classpaths = test_file_deps|map(attribute='classpath')|unique|sort -%}
+{%- set test_file_jars = test_file_deps|map(attribute='jar')|reject("in", file_jars)|unique|sort -%}
 
 dependencies {
 {%- if has_errorprone -%}
@@ -86,15 +88,15 @@ dependencies {
 {{ AddNonFileDeps(extra_target, test_file_classpaths, "testImplementation", "testImplementation") }}
 {%- endfor -%}
 
-{%- if file_deps|length %}
+{%- if file_jars|length %}
     implementation(files(listOf({#- glue -#}
-{{ AddFileDeps(file_deps) }}
+{{ AddFileJars(file_jars) }}
     )))
 {%- endif -%}
 
-{%- if test_file_deps|length %}
+{%- if test_file_jars|length %}
     testImplementation(files(listOf({#- glue -#}
-{{ AddFileDeps(test_file_deps) }}
+{{ AddFileJars(test_file_jars) }}
     )))
 {%- endif %}
 }