Skip to content

Commit 49f6223

Browse files
dimdim1177dimdim1177
committed
Remove support replaced semantics
commit_hash:7a16e5851839a75b182c5239f84838084eed682b
1 parent 1ca45e2 commit 49f6223

File tree

4 files changed

+37
-107
lines changed

4 files changed

+37
-107
lines changed

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

Lines changed: 34 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,61 @@
11
{%- macro AnnotationProcessors(func, annotation_processors) -%}
22
{%- if annotation_processors|length -%}
33
{%- set first_ap = annotation_processors|first -%}
4-
{%- if first_ap.jar is defined -%}
5-
{#- Objects in list - new format -#}
6-
{%- set annotation_processors = annotation_processors|unique|sort -%}
7-
{%- set lomboks = annotation_processors|selectattr('jar', 'startsWith', LOMBOK_PATH) -%}
8-
{%- set nolomboks = annotation_processors|rejectattr('jar', 'startsWith', LOMBOK_PATH) -%}
9-
{%- if lomboks|length -%}
10-
{%- for annotation_processor in lomboks -%}
11-
{%- set parts = rsplit(annotation_processor.jar, "/", 4) %}
4+
{%- set annotation_processors = annotation_processors|unique|sort -%}
5+
{%- set lomboks = annotation_processors|selectattr('jar', 'startsWith', LOMBOK_PATH) -%}
6+
{%- set nolomboks = annotation_processors|rejectattr('jar', 'startsWith', LOMBOK_PATH) -%}
7+
{%- if lomboks|length -%}
8+
{%- for annotation_processor in lomboks -%}
9+
{%- set parts = rsplit(annotation_processor.jar, "/", 4) %}
1210
{{ func }}("{{ parts[0]|replace("contrib/java/", "")|replace("/", ".") }}:{{ parts[1] }}:{{ parts[2] }}")
13-
{%- endfor -%}
14-
{%- endif -%}
15-
{%- if nolomboks|length -%}
16-
{%- for annotation_processor in nolomboks -%}
17-
{%- if [annotation_processor.jar]|select('startsWith', 'contrib/java/')|length -%}
11+
{%- endfor -%}
12+
{%- endif -%}
13+
{%- if nolomboks|length -%}
14+
{%- for annotation_processor in nolomboks -%}
15+
{%- if [annotation_processor.jar]|select('startsWith', 'contrib/java/')|length -%}
1816
{#- Contrib AP, use by classpath -#}
19-
{%- set parts = rsplit(annotation_processor.jar, "/", 4) %}
17+
{%- set parts = rsplit(annotation_processor.jar, "/", 4) %}
2018
{{ func }}("{{ parts[0]|replace("contrib/java/", "")|replace("/", ".") }}:{{ parts[1] }}:{{ parts[2] }}")
21-
{%- else -%}
19+
{%- else -%}
2220
{#- Has handmade AP, put all APs as jars in one list #}
2321
{{ func }}(files(listOf(
24-
{%- if annotation_processor.deps|length -%}
25-
{%- for annotation_processor_dep in annotation_processor.deps %}
22+
{%- if annotation_processor.deps|length -%}
23+
{%- for annotation_processor_dep in annotation_processor.deps %}
2624
{{ PatchRoots(output_root + "/" + annotation_processor_dep, false, "", true) }},
27-
{%- endfor -%}
28-
{%- endif %}
29-
{{ PatchRoots(output_root + "/" + annotation_processor.jar, false, "", true) }},
30-
)))
25+
{%- endfor -%}
3126
{%- endif %}
32-
{%- endfor %}
33-
{%- endif -%}
34-
{%- else -%}
35-
{#- Strings in list - old format -#}
36-
{%- set annotation_processors = annotation_processors|unique|sort -%}
37-
{%- set lomboks = annotation_processors|select('startsWith', LOMBOK_PATH) -%}
38-
{%- set nolomboks = annotation_processors|reject('startsWith', LOMBOK_PATH) -%}
39-
{%- if lomboks|length -%}
40-
{%- for annotation_processor in lomboks -%}
41-
{%- set parts = rsplit(annotation_processor, "/", 4) %}
42-
{{ func }}("{{ parts[0]|replace("contrib/java/", "")|replace("/", ".") }}:{{ parts[1] }}:{{ parts[2] }}")
43-
{%- endfor -%}
44-
{%- endif -%}
45-
{%- if nolomboks|length -%}
46-
{%- if nolomboks|reject('startsWith', 'contrib/java/')|length -%}
47-
{#- Has handmade AP, put all APs as jars in one list #}
48-
{{ func }}(files(listOf(
49-
{%- for annotation_processor in nolomboks %}
50-
{{ PatchRoots(output_root + "/" + annotation_processor, false, "", true) }},
51-
{%- endfor %}
27+
{{ PatchRoots(output_root + "/" + annotation_processor.jar, false, "", true) }},
5228
)))
53-
{%- else -%}
54-
{%- for annotation_processor in nolomboks -%}
55-
{%- set parts = rsplit(annotation_processor, "/", 4) %}
56-
{{ func }}("{{ parts[0]|replace("contrib/java/", "")|replace("/", ".") }}:{{ parts[1] }}:{{ parts[2] }}")
57-
{%- endfor -%}
58-
{%- endif -%}
59-
{%- endif -%}
29+
{%- endif %}
30+
{%- endfor %}
6031
{%- endif -%}
6132
{%- endif -%}
6233
{%- endmacro -%}
6334

6435
{%- macro Kapts(func, kapts, file_jars, test_file_jars) -%}
6536
{%- if kapts|length -%}
6637
{%- set kapt_first = kapts|first -%}
67-
{%- if kapt_first.jar is defined -%}
68-
{#- Objects list, new format-#}
69-
{%- set kapt_jars = kapts|map(attribute='jar')|unique|sort -%}
70-
{%- for kapt_jar in kapt_jars -%}
71-
{%- set kapt = kapts|selectattr('jar', 'eq', kapt_jar)|first -%}
72-
{%- if (kapt_jar in file_jars) or (kapt_jar in test_file_jars) -%}
73-
{#- found KAPT jar in depends => use kapt as jar #}
38+
{%- set kapt_jars = kapts|map(attribute='jar')|unique|sort -%}
39+
{%- for kapt_jar in kapt_jars -%}
40+
{%- set kapt = kapts|selectattr('jar', 'eq', kapt_jar)|first -%}
41+
{%- if (kapt_jar in file_jars) or (kapt_jar in test_file_jars) -%}
42+
{#- found KAPT jar in depends => use kapt as jar #}
7443
{{ func }}(files(listOf(
75-
{%- if kapt.deps|length -%}
76-
{%- for kapt_dep in kapt.deps %}
44+
{%- if kapt.deps|length -%}
45+
{%- for kapt_dep in kapt.deps %}
7746
"$output_root/{{ kapt_dep }}",
78-
{%- endfor -%}
79-
{%- endif %}
47+
{%- endfor -%}
48+
{%- endif %}
8049
"$output_root/{{ kapt_jar }}",
8150
)))
82-
{%- else -%}
83-
{#- no in depends jar => use KAPT as project() -#}
84-
{%- set path_and_jar = rsplit(kapt_jar, "/", 2) -%}
85-
{%- set classpath = 'project(":' + path_and_jar[0]|replace("/", ":") + '")' -%}
86-
{%- include "[generator]/patch_classpath.jinja" %}
87-
{{ func }}({{ classpath }})
88-
{%- endif -%}
89-
{%- endfor -%}
90-
{%- else -%}
91-
{#- Strings list, old format-#}
92-
{%- set srt_kapts = kapts|unique|sort -%}
93-
{%- set jar_kapts = [] -%}
94-
{%- set cls_kapts = srt_kapts -%}
95-
{%- if file_jars|length -%}
96-
{%- set jar_kapts = jar_kapts + srt_kapts|select('in', file_jars) -%}
97-
{%- set cls_kapts = cls_kapts|reject('in', file_jars) -%}
98-
{%- endif -%}
99-
{%- if test_file_jars|length -%}
100-
{%- set jar_kapts = jar_kapts + srt_kapts|select('in', test_file_jars) -%}
101-
{%- set cls_kapts = cls_kapts|reject('in', test_file_jars) -%}
102-
{%- endif -%}
103-
{%- if jar_kapts|length %}
104-
{{ func }}(files(listOf(
105-
{%- for kapt in jar_kapts %}
106-
"$output_root/{{ kapt }}",
107-
{%- endfor %}
108-
)))
109-
{%- endif -%}
110-
{%- if cls_kapts|length -%}
111-
{%- for kapt in cls_kapts -%}
112-
{%- set path_and_jar = rsplit(kapt, "/", 2) -%}
113-
{%- set classpath = 'project(":' + path_and_jar[0]|replace("/", ":") + '")' -%}
114-
{%- include "[generator]/patch_classpath.jinja" %}
51+
{%- else -%}
52+
{#- no in depends jar => use KAPT as project() -#}
53+
{%- set path_and_jar = rsplit(kapt_jar, "/", 2) -%}
54+
{%- set classpath = 'project(":' + path_and_jar[0]|replace("/", ":") + '")' -%}
55+
{%- include "[generator]/patch_classpath.jinja" %}
11556
{{ func }}({{ classpath }})
116-
{%- endfor -%}
11757
{%- endif -%}
118-
{%- endif -%}
58+
{%- endfor -%}
11959
{%- endif -%}
12060
{%- endmacro -%}
12161

@@ -189,22 +129,14 @@ dependencies {
189129
{%- endfor -%}
190130
{%- endif -%}
191131
{#- glue -#}
192-
{{ AnnotationProcessors("annotationProcessor", target.use_annotation_processor) }}
193-
{#- glue -#}
194132
{{ AnnotationProcessors("annotationProcessor", target.use_annotation_processors) }}
195-
{%- set test_annotation_processors = extra_targets|selectattr('use_annotation_processor')|map(attribute='use_annotation_processor')|sum -%}
196-
{{ AnnotationProcessors("testAnnotationProcessor", test_annotation_processors) }}
197133
{%- set test_annotation_processors = extra_targets|selectattr('use_annotation_processors')|map(attribute='use_annotation_processors')|sum -%}
198134
{{ AnnotationProcessors("testAnnotationProcessor", test_annotation_processors) }}
199135
{%- if with_kapt -%}
200-
{{ Kapts("kapt", target.kapt.classpaths, file_jars, test_file_jars) }}
201-
{#- glue -#}
202136
{{ Kapts("kapt", target.kapt.kapts, file_jars, test_file_jars) }}
203137
{%- endif -%}
204138
{%- if with_test_kapt -%}
205139
{%- for extra_target in extra_targets -%}
206-
{{ Kapts("kaptTest", extra_target.kapt.classpaths, file_jars, test_file_jars) }}
207-
{#- glue -#}
208140
{{ Kapts("kaptTest", extra_target.kapt.kapts, file_jars, test_file_jars) }}
209141
{%- endfor -%}
210142
{%- endif -%}

‎build/export_generators/ide-gradle/generator.toml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ is_extra_target = true
3838
[attrs.target]
3939
# DEPRECATED
4040
annotation_processors="list"
41-
use_annotation_processor="list"
4241

4342
required_jdk="str"
4443
add_vcs_info_to_mf="bool"
@@ -134,7 +133,6 @@ target_commands-flags="list"
134133
with_kapt="flag"
135134
kapt-opts="list"
136135
kapt-processors="list"
137-
kapt-classpaths="list"
138136
kapt-kapts="list"
139137
kapt-kapts-ITEM="dict"
140138
kapt-kapts-jar="str"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fun encodeAPOptions(options: Map<String, String>): String {
4646
{%- set all_kapt_opts = all_targets|selectattr('kapt')|map(attribute='kapt')|selectattr('opts')|map(attribute='opts')|sum -%}
4747
{%- set opts_correctErrorTypes = all_kapt_opts|select('startsWith', 'plugin:org.jetbrains.kotlin.kapt3:correctErrorTypes=') -%}
4848
{%- set opts_verbose = all_kapt_opts|select('startsWith', 'plugin:org.jetbrains.kotlin.kapt3:verbose=') -%}
49-
{%- set has_annotation_processors = all_targets|selectattr('use_annotation_processor')|map(attribute='use_annotation_processor')|sum|length or all_targets|selectattr('use_annotation_processors')|map(attribute='use_annotation_processors')|sum|length -%}
49+
{%- set has_annotation_processors = all_targets|selectattr('use_annotation_processors')|map(attribute='use_annotation_processors')|sum|length -%}
5050
{%- if all_kapt_processors|length or opts_correctErrorTypes|length or opts_verbose|length or all_kapt_ap_opts|length or has_annotation_processors -%}
5151

5252
kapt {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{%- set with_kotlinc_plugin_serialization = all_targets|selectattr('with_kotlinc_plugin_serialization')|map(attribute='with_kotlinc_plugin_serialization')|sum -%}
2020
{%- set with_kotlinc_plugin_lombok = all_targets|selectattr('with_kotlinc_plugin_lombok')|map(attribute='with_kotlinc_plugin_lombok')|sum -%}
2121
{#- KAPT -#}
22-
{%- set with_kapt = target.with_kapt and (target.kapt.classpaths|length or target.kapt.kapts|length) -%}
22+
{%- set with_kapt = target.with_kapt and target.kapt.kapts|length -%}
2323
{%- set with_test_kapt = extra_targets|selectattr('with_kapt', 'eq', true)|map(attribute='with_kapt')|length and extra_targets|selectattr('with_kapt', 'eq', true)|selectattr('kapt')|map(attribute='kapt')|selectattr('classpaths')|map(attribute='classpaths')|sum|length or extra_targets|selectattr('with_kapt', 'eq', true)|map(attribute='with_kapt')|length and extra_targets|selectattr('with_kapt', 'eq', true)|selectattr('kapt')|map(attribute='kapt')|selectattr('kapts')|map(attribute='kapts')|sum|length -%}
2424
{#- Options kapt.kotlin.generated autocreated by kapt plugin, skip it -#}
2525
{%- set all_kapt_ap_opts = all_targets|selectattr('kapt')|map(attribute='kapt')|selectattr('ap_opts')|map(attribute='ap_opts')|sum|reject('startsWith', 'kapt.kotlin.generated=') -%}
@@ -34,7 +34,7 @@
3434

3535
{#- Lombok -#}
3636
{%- set LOMBOK_PATH = 'contrib/java/org/projectlombok/lombok' -%}
37-
{%- set with_lombok_plugin = not(disable_lombok_plugin) and (all_targets|selectattr('use_annotation_processors')|map(attribute='use_annotation_processors')|sum|map(attribute='jar')|select('startsWith', LOMBOK_PATH)|length or all_targets|selectattr('use_annotation_processor')|map(attribute='use_annotation_processor')|sum|select('startsWith', LOMBOK_PATH)|length) -%}
37+
{%- set with_lombok_plugin = not(disable_lombok_plugin) and all_targets|selectattr('use_annotation_processors')|map(attribute='use_annotation_processors')|sum|map(attribute='jar')|select('startsWith', LOMBOK_PATH)|length -%}
3838

3939
{#- JNI -#}
4040
{%- set jnis = all_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('type', 'eq', 'dll')|selectattr('jar')|map(attribute='jar')|unique -%}

0 commit comments

Comments
 (0)