Remove deprecated jar_(re)source_set semantics everywhere

Remove deprecated jar_(re)source_set semantics everywhere
commit_hash:b96eff6e8fee0931d079da992eea5d37229bec5e

3 files changed, 2 insertions, 59 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index 4b520e06d07..950bfba1ec2 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -441,16 +441,9 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[],
     _FILL_JAR_GEN_SRCS(JAR_GEN_JSRCS SRC_JAR $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst $KT_SRCLIST ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt $Globs EXCLUDE $EXCLUDE)
 }
 
-# tag:java-specific tag:deprecated
-# Fill semantic jar_source_set/jar_resource_set by JAVA_SRCS() Args
-_JAR_SOURCE_SET_SEM=
-macro _SEM_JAR_SOURCE_SET(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"jar_resource_set":"jar_source_set", SKIP_CHECK_SRCDIR?"SKIP_CHECK_SRCDIR":"", Globs...) {
-    # Now ignore SKIP_CHECK_SRCDIR, EXCLUDE, FILES
-    SET_APPEND(_JAR_SOURCE_SET_SEM && $RESOURCES ${pre=${SRCDIR}\::Globs})
-}
-
 # tag:java-specific
 # Fill semantic source_sets/resource_sets by JAVA_SRCS() Args
+_JAR_SOURCE_SET_SEM=
 macro _SEM_SOURCE_SETS(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"resource_sets":"source_sets", SKIP_CHECK_SRCDIR?"SKIP_CHECK_SRCDIR":"", Globs...) {
     # Now ignore SKIP_CHECK_SRCDIR, EXCLUDE, FILES
     SET_APPEND(_JAR_SOURCE_SET_SEM && ${RESOURCES}-ITEM && ${RESOURCES}-dir ${SRCDIR} && ${RESOURCES}-realdir ${SRCDIR} && ${RESOURCES}-globs ${Globs} && ${RESOURCES}-prefix ${PACKAGE_PREFIX})
@@ -460,7 +453,6 @@ macro _SEM_SOURCE_SETS(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOUR
 macro FULL_JAVA_SRCS(Args...) {
     _IDEA_JAVA_SRCS_VALUE($Args)
     _JAVA_SRCS($Args)
-    _SEM_JAR_SOURCE_SET($Args)
     _SEM_SOURCE_SETS($Args)
 }
 
@@ -1914,7 +1906,6 @@ macro JAVA_SRCS(Args...) {
     # TODO Use FULL_JAVA_SRCS
     _IDEA_JAVA_SRCS_VALUE($Args)
     # Fill semantic for non-standard sources/resources
-    _SEM_JAR_SOURCE_SET($Args)
     _SEM_SOURCE_SETS($Args)
 }
 
diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml
index 2d0e274b85c..27c04c01810 100644
--- a/build/export_generators/ide-gradle/generator.toml
+++ b/build/export_generators/ide-gradle/generator.toml
@@ -34,8 +34,6 @@ is_extra_target = true
 [attrs.target]
 # DEPRECATED
 annotation_processors="list"
-jar_source_set="list"
-jar_resource_set="list"
 
 required_jdk="str"
 add_vcs_info_to_mf="bool"
diff --git a/build/export_generators/ide-gradle/source_sets.jinja b/build/export_generators/ide-gradle/source_sets.jinja
index e7bafedaafc..9fdd81a46bf 100644
--- a/build/export_generators/ide-gradle/source_sets.jinja
+++ b/build/export_generators/ide-gradle/source_sets.jinja
@@ -17,28 +17,8 @@
 {%- endmacro %}
 
 sourceSets {
-{%- set target_jar_source_set = target.jar_source_set|unique -%}
-{%- set target_jar_resource_set = target.jar_resource_set|unique -%}
-{%- if target_jar_source_set|length or target_jar_resource_set|length or target.source_sets|length or target.resource_sets|length or proto_template %}
+{%- if target.source_sets|length or target.resource_sets|length or proto_template %}
     main {
-{#- DEPRECATED vvvvvvvvvvvvvvvv -#}
-{%-     if target_jar_source_set|length and not(target.source_sets|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 and not(target.resource_sets|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 -%}
-{#- DEPRECATED ^^^^^^^^^^^^^^^^ -#}
-
 {%-     if target.source_sets|length -%}
 {%-         for source_set in target.source_sets -%}
 {{ SomeSet(source_set, "java") }}
@@ -73,32 +53,6 @@ sourceSets {
 {%-         if extra_target.test_reldir -%}
 {%-             set reldir = extra_target.test_reldir + "/" -%}
 {%-         endif -%}
-{#- DEPRECATED vvvvvvvvvvvvvvvv -#}
-{%-         if extra_target.jar_source_set|length and not(extra_target.source_sets|length) -%}
-{%-             for source_set in extra_target.jar_source_set|unique -%}
-{%-                 set srcdir_glob = split(source_set, ':', 2) -%}
-{%-                 if srcdir_glob[0][0] == "/" -%}
-{#-                     Absolute path in glob -#}
-{%-                     set srcdir = srcdir_glob[0] -%}
-{%-                 else -%}
-{%-                     set srcdir = reldir + srcdir_glob[0] -%}
-{%-                 endif %}
-        java.srcDir({{ PatchRoots(srcdir) }})
-{%-             endfor -%}
-{%-         endif -%}
-{%-         if extra_target.jar_resource_set|length and not(extra_target.resource_sets|length) -%}
-{%-             for resource_set in extra_target.jar_resource_set|unique -%}
-{%-                 set resdir_glob = split(resource_set, ':', 2) -%}
-{%-                 if resdir_glob[0][0] == "/" -%}
-{#-                     Absolute path in glob -#}
-{%-                     set resdir = resdir_glob[0] -%}
-{%-                 else -%}
-{%-                     set resdir = reldir + resdir_glob[0] -%}
-{%-                 endif %}
-        resources.srcDir({{ PatchRoots(resdir) }})
-{%-             endfor -%}
-{%-         endif -%}
-{#- DEPRECATED ^^^^^^^^^^^^^^^^ -#}
 {%-         for source_set in extra_target.source_sets -%}
 {{ SomeSet(source_set, "java", reldir) }}
 {%-         endfor -%}