Address nit and apply fix to confirm travis success

google · Apr 16, 2021 · cf0419b · cf0419b
1 parent 78c6183
commit cf0419b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufExtract.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufExtract.groovy
@@ -115,7 +115,7 @@ abstract class ProtobufExtract extends DefaultTask {
       spec.include('**/*.proto')
       spec.into(destDir)
       // gradle 7+ requires a duplicate strategy to be explicitly defined
-      // spec.duplicatesStrategy = DuplicatesStrategy.INCLUDE
+      spec.duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
   }
 

diff --git a/testProjectKotlinDslCopySpec/src/main/proto/google/type/money.proto b/testProjectKotlinDslCopySpec/src/main/proto/google/type/money.proto
@@ -39,4 +39,4 @@ message Money {
   // If `units` is negative, `nanos` must be negative or zero.
   // For example $-1.75 is represented as `units`=-1 and `nanos`=-750,000,000.
   int32 nanos = 3;
-}
+}