fix: fix Gradle build error for sourcesJar task on generated libs (#894)

chanseokoh · web-flow · commit 1060a1af874d · 2022-01-10T15:55:48.000-05:00
diff --git a/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl b/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl
@@ -33,14 +33,6 @@ test {
   exclude "**/*SmokeTest*"
 }
 
-sourceSets {
-  main {
-    java {
-      srcDir 'src/main/java'
-    }
-  }
-}
-
 clean {
   delete 'all-jars'
 }
diff --git a/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl b/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl
@@ -35,14 +35,6 @@ test {
   exclude "**/*SmokeTest*"
 }
 
-sourceSets {
-  main {
-    java {
-      srcDir 'src/main/java'
-    }
-  }
-}
-
 clean {
   delete 'all-jars'
 }
diff --git a/rules_java_gapic/resources/gradle/client_rest.gradle.tmpl b/rules_java_gapic/resources/gradle/client_rest.gradle.tmpl
@@ -30,14 +30,6 @@ test {
   exclude "**/*SmokeTest*"
 }
 
-sourceSets {
-  main {
-    java {
-      srcDir 'src/main/java'
-    }
-  }
-}
-
 clean {
   delete 'all-jars'
 }
diff --git a/rules_java_gapic/resources/gradle/grpc.gradle.tmpl b/rules_java_gapic/resources/gradle/grpc.gradle.tmpl
@@ -16,14 +16,6 @@ dependencies {
   {{extra_deps}}
 }
 
-sourceSets {
-  main {
-    java {
-      srcDir 'src/main/java'
-    }
-  }
-}
-
 task javadocJar(type: Jar) {
   classifier = 'javadoc'
   from javadoc
diff --git a/rules_java_gapic/resources/gradle/proto.gradle.tmpl b/rules_java_gapic/resources/gradle/proto.gradle.tmpl
@@ -23,9 +23,6 @@ sourceSets {
     resources {
       srcDir 'src/main/proto'
     }
-    java {
-      srcDir 'src/main/java'
-    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,6 @@ test {`
`33`	`33`	`exclude "*/SmokeTest*"`
`34`	`34`	`}`
`35`	`35`
`36`		`-sourceSets {`
`37`		`- main {`
`38`		`- java {`
`39`		`- srcDir 'src/main/java'`
`40`		`- }`
`41`		`- }`
`42`		`-}`
`43`		`-`
`44`	`36`	`clean {`
`45`	`37`	`delete 'all-jars'`
`46`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,6 @@ test {`
`35`	`35`	`exclude "*/SmokeTest*"`
`36`	`36`	`}`
`37`	`37`
`38`		`-sourceSets {`
`39`		`- main {`
`40`		`- java {`
`41`		`- srcDir 'src/main/java'`
`42`		`- }`
`43`		`- }`
`44`		`-}`
`45`		`-`
`46`	`38`	`clean {`
`47`	`39`	`delete 'all-jars'`
`48`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,6 @@ test {`
`30`	`30`	`exclude "*/SmokeTest*"`
`31`	`31`	`}`
`32`	`32`
`33`		`-sourceSets {`
`34`		`- main {`
`35`		`- java {`
`36`		`- srcDir 'src/main/java'`
`37`		`- }`
`38`		`- }`
`39`		`-}`
`40`		`-`
`41`	`33`	`clean {`
`42`	`34`	`delete 'all-jars'`
`43`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,6 @@ sourceSets {`
`23`	`23`	`resources {`
`24`	`24`	`srcDir 'src/main/proto'`
`25`	`25`	`}`
`26`		`- java {`
`27`		`- srcDir 'src/main/java'`
`28`		`- }`
`29`	`26`	`}`
`30`	`27`	`}`
`31`	`28`