fix: fix broken Gradle allJars task on generated libs (#901)

chanseokoh · web-flow · commit bfa03bfa58ad · 2022-01-14T16:21:15.000-05:00
diff --git a/gapic-generator-java/.github/workflows/ci.yaml b/gapic-generator-java/.github/workflows/ci.yaml
@@ -52,7 +52,7 @@ jobs:
           mkdir /tmp/java-storage
           tar zxvf bazel-bin/test/integration/google-cloud-storage-v2-java.tar.gz -C /tmp/java-storage
           pushd /tmp/java-storage/google-cloud-storage-v2-java
-          ./gradlew clean build publishToMavenLocal
+          ./gradlew clean build publishToMavenLocal sourcesJar allJars
           popd
 
       - name: Gradle Build Generated Compute Client Library
@@ -62,7 +62,7 @@ jobs:
           bazel --batch build @com_google_googleapis//google/cloud/compute/v1small:google-cloud-compute-small-v1-java
           tar zxvf bazel-bin/external/com_google_googleapis/google/cloud/compute/v1small/google-cloud-compute-small-v1-java.tar.gz -C /tmp/java-compute
           pushd /tmp/java-compute/google-cloud-compute-small-v1-java
-          ./gradlew clean build publishToMavenLocal
+          ./gradlew clean build publishToMavenLocal sourcesJar allJars
           popd
 
       - uses: actions/upload-artifact@v2
diff --git a/gapic-generator-java/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl b/gapic-generator-java/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl
@@ -40,6 +40,6 @@ clean {
 task allJars(type: Copy) {
   dependsOn test, jar
   into 'all-jars'
-  // Replace with `from configurations.testRuntimeOnly, jar` to include test dependencies
-  from configurations.runtimeOnly, jar
+  // Replace with `from configurations.testRuntimeClasspath, jar` to include test dependencies
+  from configurations.runtimeClasspath, jar
 }
diff --git a/gapic-generator-java/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl b/gapic-generator-java/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl
@@ -42,6 +42,6 @@ clean {
 task allJars(type: Copy) {
   dependsOn test, jar
   into 'all-jars'
-  // Replace with `from configurations.testRuntimeOnly, jar` to include test dependencies
-  from configurations.runtimeOnly, jar
+  // Replace with `from configurations.testRuntimeClasspath, jar` to include test dependencies
+  from configurations.runtimeClasspath, jar
 }
diff --git a/gapic-generator-java/rules_java_gapic/resources/gradle/client_rest.gradle.tmpl b/gapic-generator-java/rules_java_gapic/resources/gradle/client_rest.gradle.tmpl
@@ -37,6 +37,6 @@ clean {
 task allJars(type: Copy) {
   dependsOn test, jar
   into 'all-jars'
-  // Replace with `from configurations.testRuntimeOnly, jar` to include test dependencies
-  from configurations.runtimeOnly, jar
+  // Replace with `from configurations.testRuntimeClasspath, jar` to include test dependencies
+  from configurations.runtimeClasspath, jar
 }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ clean {`
`40`	`40`	`task allJars(type: Copy) {`
`41`	`41`	`dependsOn test, jar`
`42`	`42`	`into 'all-jars'`
`43`		- // Replace with `from configurations.testRuntimeOnly, jar` to include test dependencies
`44`		`- from configurations.runtimeOnly, jar`
	`43`	+ // Replace with `from configurations.testRuntimeClasspath, jar` to include test dependencies
	`44`	`+ from configurations.runtimeClasspath, jar`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ clean {`
`42`	`42`	`task allJars(type: Copy) {`
`43`	`43`	`dependsOn test, jar`
`44`	`44`	`into 'all-jars'`
`45`		- // Replace with `from configurations.testRuntimeOnly, jar` to include test dependencies
`46`		`- from configurations.runtimeOnly, jar`
	`45`	+ // Replace with `from configurations.testRuntimeClasspath, jar` to include test dependencies
	`46`	`+ from configurations.runtimeClasspath, jar`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ clean {`
`37`	`37`	`task allJars(type: Copy) {`
`38`	`38`	`dependsOn test, jar`
`39`	`39`	`into 'all-jars'`
`40`		- // Replace with `from configurations.testRuntimeOnly, jar` to include test dependencies
`41`		`- from configurations.runtimeOnly, jar`
	`40`	+ // Replace with `from configurations.testRuntimeClasspath, jar` to include test dependencies
	`41`	`+ from configurations.runtimeClasspath, jar`
`42`	`42`	`}`