SourcesJar must run after Compile Java/Kotlin

SourcesJar must run after Compile Java/Kotlin
commit_hash:16dc7c43f00afa017787a39c778a33bfefe6ab65

Author: dimdim1177

build/export_generators/ide-gradle/build.gradle.kts.jinja

@@ -28,6 +28,7 @@
 {%- include "[generator]/javadoc.jinja" -%}
 {%- include "[generator]/run_program.jinja" -%}
 {%- include "[generator]/run_java_program.jinja" -%}
+{%- include "[generator]/run_common.jinja" -%}
 {%- include "[generator]/dependencies.jinja" -%}
 {%- include "extra-tests.gradle.kts" ignore missing -%}
 {%- if publish -%}

build/export_generators/ide-gradle/build.gradle.kts.proto.jinja

@@ -34,6 +34,7 @@
 {%- include "[generator]/proto_prepare.jinja" -%}
 {%- include "[generator]/run_program.jinja" -%}
 {%- include "[generator]/run_java_program.jinja" -%}
+{%- include "[generator]/run_common.jinja" -%}
 {%- include "[generator]/javadoc.jinja" -%}
 {%- include "[generator]/proto_dependencies.jinja" -%}
 {%- include "[generator]/debug.jinja" ignore missing -%}

build/export_generators/ide-gradle/run_common.jinja

@@ -0,0 +1,11 @@
+{%- if not proto_template and (target.runs|length or target.custom_runs|length) %}
+
+tasks.getByName("sourcesJar").dependsOn(tasks.compileJava)
+{%-     if with_kotlin %}
+tasks.getByName("sourcesJar").dependsOn(tasks.compileKotlin)
+{%-     endif %}
+tasks.getByName("sourcesJar").mustRunAfter(tasks.compileTestJava)
+{%-     if with_kotlin %}
+tasks.getByName("sourcesJar").mustRunAfter(tasks.compileTestKotlin)
+{%-     endif -%}
+{%- endif -%}

build/export_generators/ide-gradle/run_java_program.jinja

@@ -110,9 +110,5 @@ tasks.compileTestKotlin.configure {
     dependsOn(runJav{{ loop.index }})
 }
 {%-        endif -%}
-{%-    endfor -%}
-{%-    if not proto_template %}
-
-tasks.getByName("sourcesJar").dependsOn(tasks.compileJava)
-{%-     endif -%}
+{%-     endfor -%}
 {%- endif -%}

build/export_generators/ide-gradle/run_program.jinja

@@ -71,9 +71,5 @@ tasks.compileTestKotlin.configure {
     dependsOn(runProg{{ loop.index }})
 }
 {%         endif -%}
-{%-    endfor -%}
-{%-    if not proto_template %}
-
-tasks.getByName("sourcesJar").dependsOn(tasks.compileJava)
-{%-     endif -%}
+{%-     endfor -%}
 {%- endif -%}