Unique source/resource sets, refactor templates

Unique source/resource sets, refactor templates
commit_hash:b23a8d4a220dc84dcb59d63e8924cc5e70537ba7

5 files changed, 41 insertions, 72 deletions

diff --git a/build/export_generators/ide-gradle/build.gradle.kts.any.jinja b/build/export_generators/ide-gradle/build.gradle.kts.any.jinja
index aa14d715ad0..79936b6822c 100644
--- a/build/export_generators/ide-gradle/build.gradle.kts.any.jinja
+++ b/build/export_generators/ide-gradle/build.gradle.kts.any.jinja
@@ -34,7 +34,6 @@
 {%-     include "[generator]/proto_builddir.jinja" -%}
 {%-     include "[generator]/proto_plugins.jinja" -%}
 {%-     include "[generator]/proto_configuration.jinja" -%}
-{%-     include "[generator]/proto_source_sets.jinja" -%}
 {%-     include "[generator]/protobuf.jinja" -%}
 {%-     include "[generator]/proto_prepare.jinja" -%}
 {%-     include "[generator]/build.gradle.kts.common.jinja" -%}
@@ -47,7 +46,6 @@
 {%-     include "[generator]/kotlin_plugins.jinja" -%}
 {%-     include "[generator]/preview.jinja" -%}
 {%-     include "[generator]/configuration.jinja" -%}
-{%-     include "[generator]/source_sets.jinja" -%}
 {%-     include "[generator]/test.jinja" -%}
 {%-     include "[generator]/build.gradle.kts.common.jinja" -%}
 {%-     include "[generator]/dependencies.jinja" -%}
diff --git a/build/export_generators/ide-gradle/build.gradle.kts.common.jinja b/build/export_generators/ide-gradle/build.gradle.kts.common.jinja
index be59a3af157..72e0f4ca0fa 100644
--- a/build/export_generators/ide-gradle/build.gradle.kts.common.jinja
+++ b/build/export_generators/ide-gradle/build.gradle.kts.common.jinja
@@ -5,6 +5,11 @@
 {%- include "[generator]/javac_flags.jinja" -%}
 {%- include "[generator]/kotlinc_flags.jinja" -%}
 
+{%- include "[generator]/source_sets.jinja" -%}
 {%- include "[generator]/codegen.jinja" -%}
 
-{%- include "[generator]/javadoc.jinja" -%}
+{#- To disable redundant javadoc (it may fail the build) #}
+
+tasks.withType<Javadoc>().configureEach {
+    isEnabled = false
+}
diff --git a/build/export_generators/ide-gradle/javadoc.jinja b/build/export_generators/ide-gradle/javadoc.jinja
deleted file mode 100644
index 94fc8c750ff..00000000000
--- a/build/export_generators/ide-gradle/javadoc.jinja
+++ /dev/null
@@ -1,4 +0,0 @@
-{#- To disable redundant javadoc (it may fail the build) #}
-tasks.withType<Javadoc>().configureEach {
-    isEnabled = false
-}
diff --git a/build/export_generators/ide-gradle/proto_source_sets.jinja b/build/export_generators/ide-gradle/proto_source_sets.jinja
deleted file mode 100644
index 540b4003295..00000000000
--- a/build/export_generators/ide-gradle/proto_source_sets.jinja
+++ /dev/null
@@ -1,37 +0,0 @@
-{#- empty string #}
-sourceSets {
-    main {
-{%-     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] -%}
-{%-             if srcdir != 'src/main/java' %}
-        java.srcDir({{ PatchRoots(srcdir) }})
-{%-             endif -%}
-{%-         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] -%}
-{%-             if resdir != 'src/main/resources' %}
-        resources.srcDir({{ PatchRoots(resdir) }})
-{%-             endif -%}
-{%-         endfor -%}
-{%-     endif %}
-        java.srcDir("$buildDir/generated/source/proto/main/java")
-{%- if target.proto_grpc %}
-        java.srcDir("$buildDir/generated/source/proto/main/grpc")
-{%- endif %}
-    }
-    test {
-        java.srcDir("$buildDir/generated/source/proto/test/java")
-{%- if target.proto_grpc %}
-        java.srcDir("$buildDir/generated/source/proto/test/grpc")
-{%- endif %}
-    }
-}
-
-tasks.withType<Jar>() {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-}
diff --git a/build/export_generators/ide-gradle/source_sets.jinja b/build/export_generators/ide-gradle/source_sets.jinja
index aff24144a88..e127569c458 100644
--- a/build/export_generators/ide-gradle/source_sets.jinja
+++ b/build/export_generators/ide-gradle/source_sets.jinja
@@ -1,6 +1,8 @@
 {#- empty string #}
 sourceSets {
-{%- if target.runs|length or target.jar_source_set|length %}
+{%- 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:
@@ -9,23 +11,25 @@ sourceSets {
             resources.srcDir("src/main/resources")
 
         #}
-{%-     if target.jar_source_set|length -%}
-{%-         for source_set in target.jar_source_set -%}
+{%-     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] -%}
-{%-             if srcdir != 'src/main/java' %}
+{%-             set srcdir = srcdir_glob[0] %}
         java.srcDir({{ PatchRoots(srcdir) }})
-{%-             endif -%}
 {%-         endfor -%}
 {%-     endif %}
-{%-     if target.jar_resource_set|length -%}
-{%-         for resource_set in target.jar_resource_set -%}
+{%-     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] -%}
-{%-             if resdir != 'src/main/resources' %}
+{%-             set resdir = resdir_glob[0] %}
         resources.srcDir({{ PatchRoots(resdir) }})
-{%-             endif -%}
 {%-         endfor -%}
+{%-     endif -%}
+{%-     if proto_template %}
+        java.srcDir("$buildDir/generated/source/proto/main/java")
+{%-         if target.proto_grpc %}
+        java.srcDir("$buildDir/generated/source/proto/main/grpc")
+{%-         endif %}
 {%-     endif %}
     }
 {%- endif %}
@@ -37,6 +41,12 @@ sourceSets {
             resources.srcDir("src/test/resources")
 
         #}
+{%- if proto_template %}
+        java.srcDir("$buildDir/generated/source/proto/test/java")
+{%-     if target.proto_grpc %}
+        java.srcDir("$buildDir/generated/source/proto/test/grpc")
+{%-     endif -%}
+{%- else %}
         java.srcDir("ut/java")
         resources.srcDir("ut/resources")
         java.srcDir("src/test-integration/java")
@@ -48,25 +58,22 @@ sourceSets {
         java.srcDir("src/intTest/java")
         resources.srcDir("src/intTest/resources")
 
-{%- set extra_target_source_sets = extra_targets|selectattr('jar_source_set')|map(attribute='jar_source_set')|sum|unique -%}
-{%- if extra_target_source_sets|length -%}
-{%-     for source_set in extra_target_source_sets -%}
-{%-         set srcdir_glob = split(source_set, ':') -%}
-{%-         set srcdir = srcdir_glob[0] -%}
-{%-         if srcdir != 'src/test/java' %}
+{%-     set extra_target_source_sets = extra_targets|selectattr('jar_source_set')|map(attribute='jar_source_set')|sum|reject('startsWith', 'src/test/java:')|unique -%}
+{%-     if extra_target_source_sets|length -%}
+{%-         for source_set in extra_target_source_sets -%}
+{%-             set srcdir_glob = split(source_set, ':') -%}
+{%-             set srcdir = srcdir_glob[0] %}
         java.srcDir({{ PatchRoots(srcdir) }})
-{%-         endif -%}
-{%-     endfor -%}
-{%- endif %}
-{%- set extra_target_resource_sets = extra_targets|selectattr('jar_resource_set')|map(attribute='jar_resource_set')|sum|unique -%}
-{%- if extra_target_resource_sets|length -%}
-{%-     for resource_set in extra_target_resource_sets -%}
-{%-         set resdir_glob = split(resource_set, ':') -%}
-{%-         set resdir = resdir_glob[0] -%}
-{%-         if resdir != 'src/main/resources' %}
+{%-         endfor -%}
+{%-     endif %}
+{%-     set extra_target_resource_sets = extra_targets|selectattr('jar_resource_set')|map(attribute='jar_resource_set')|sum|reject('startsWith', 'src/test/resources:')|unique -%}
+{%-     if extra_target_resource_sets|length -%}
+{%-         for resource_set in extra_target_resource_sets -%}
+{%-             set resdir_glob = split(resource_set, ':') -%}
+{%-             set resdir = resdir_glob[0] %}
         resources.srcDir({{ PatchRoots(resdir) }})
-{%-         endif -%}
-{%-     endfor -%}
+{%-         endfor -%}
+{%-     endif -%}
 {%- endif %}
     }
 }