2 files changed, 53 insertions, 34 deletions
diff --git a/build/export_generators/gradle/build.gradle.kts.jinja b/build/export_generators/gradle/build.gradle.kts.jinja
index ccf0a34e6eb..c7df3e75882 100644
--- a/build/export_generators/gradle/build.gradle.kts.jinja
+++ b/build/export_generators/gradle/build.gradle.kts.jinja
@@ -34,41 +34,47 @@ java {
 }
 
 dependencies {
-{%  if has_junit5_test -%}
+{%- if has_junit5_test %}
     testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
     api("org.apache.commons:commons-math3:3.6.1")
     api("com.google.guava:guava:31.0.1-jre")
 {%  endif -%}
-{%  for library in target.consumer -%}
-{%      set classpath = library.classpath -%}
-{%      if classpath|replace('"','') == classpath -%}
-{%          set classpath = '"' + classpath + '"' -%}
-{%      endif -%}
-{%      if mainClass -%}
-{%          if library.excludes.consumer is defined %}
-    implementation({{ classpath }}) {
-{%              for exclude in library.excludes.consumer if exclude.classpath -%}
-{%                  set classpath = exclude.classpath|replace('"','') -%}
-{%                  set classpath_parts = split(classpath, ':') -%}
-        exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
-{%              endfor -%}
-    }
-{%          else -%}
+{%- for library in target.consumer if library.classpath -%}
+{%-     set classpath = library.classpath -%}
+{%-     if classpath|replace('"','') == classpath -%}
+{%-         set classpath = '"' + classpath + '"' -%}
+{%-     endif -%}
+{%-     if library.type != "contrib" %}
     implementation({{ classpath }})
-{%          endif -%}
-{%      else -%}
+{%-     else %}
     api({{ classpath }})
-{%      endif -%}
+{%-     endif -%}
+{%-     if library.excludes.consumer is defined %} {
+{%          for exclude in library.excludes.consumer if exclude.classpath -%}
+{%-             set classpath = exclude.classpath|replace('"','') -%}
+{%-             set classpath_parts = split(classpath, ':') -%}
+        exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
+{%          endfor -%}
+    }
+{%-     endif -%}
 {%  endfor -%}
-{%  for extra_target in extra_targets -%}
-{%      for library in extra_target.consumer -%}
-{%          set classpath = library.classpath -%}
-{%          if classpath|replace('"','') == classpath -%}
-{%              set classpath = '"' + classpath + '"' -%}
-{%          endif -%}
+{%- for extra_target in extra_targets -%}
+{%-     for library in extra_target.consumer if library.classpath -%}
+{%-         set classpath = library.classpath -%}
+{%-         if classpath|replace('"','') == classpath -%}
+{%-              set classpath = '"' + classpath + '"' -%}
+{%-         endif %}
     testImplementation({{ classpath }})
+{%-         if library.excludes.consumer is defined %} {
+{%              for exclude in library.excludes.consumer if exclude.classpath -%}
+{%-                 set classpath = exclude.classpath|replace('"','') -%}
+{%-                 set classpath_parts = split(classpath, ':') -%}
+        exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
+{%              endfor -%}
+    }
+{%-         endif -%}
 {%      endfor -%}
-{%  endfor -%}
+{%  endfor %}
 }
 
 {%  if has_junit5_test -%}
diff --git a/build/export_generators/gradle/build.gradle.kts.proto.jinja b/build/export_generators/gradle/build.gradle.kts.proto.jinja
index 1d84696c13a..bdc805ded6c 100644
--- a/build/export_generators/gradle/build.gradle.kts.proto.jinja
+++ b/build/export_generators/gradle/build.gradle.kts.proto.jinja
@@ -27,14 +27,27 @@ java {
 }
 
 dependencies {
-{%- for library in target.consumer -%}
-{%      set classpath = library.classpath -%}
-{%      if classpath|replace('"','') == classpath -%}
-{%          set classpath = '"' + classpath + '"' -%}
-{%      endif %}
-    api({{ classpath }})
-{%- endfor %}
-{%  if target.proto_namespace %}
+{%- for library in target.consumer if library.classpath -%}
+{%-     set classpath = library.classpath -%}
+{%-     if classpath|replace('"','') == classpath -%}
+{%-         set classpath = '"' + classpath + '"' -%}
+{%-     endif %}
+{%-     if library.type != "contrib" %}
+    implementation
+{%-     else %}
+    api
+{%-     endif -%}({{ classpath }})
+{%-     if library.excludes.consumer is defined %} {
+{%          for exclude in library.excludes.consumer -%}
+{%              set classpath = exclude.classpath|replace('"','') -%}
+{%              set classpath_parts = split(classpath, ':') -%}
+        exclude(group = "{{ classpath_parts[0] }}", module = "{{ classpath_parts[1] }}")
+{%          endfor -%}
+    }
+{%-     endif -%}
+{%- endfor -%}
+
+{%- if target.proto_namespace %}
     protobuf(files(File(buildProtoDir, "{{ target.proto_namespace }}")))
 {%- else %}
     protobuf(files(buildProtoDir))