Merge pull request #1364 from dimagi/copy_of_buildFix

Duplicate of buildFix
dimagi · Oct 23, 2023 · 56eb3e9 · 56eb3e9
2 parents 53ad733 + 2212894
commit 56eb3e9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -162,7 +162,7 @@ task cliJar(type: Jar, dependsOn: cliClasses) {
         attributes 'Main-Class': 'org.commcare.util.cli.CliMain'
     }
     duplicatesStrategy = DuplicatesStrategy.FAIL
-    filesMatching(["**/LICENSE.txt","**/NOTICE.txt"]) {
+    filesMatching(["**/LICENSE.txt","**/NOTICE.txt", "META-INF/**"]) {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
 }
@@ -177,7 +177,7 @@ task ccapiJar(type: Jar, dependsOn: ccapiClasses) {
         }
     }
     duplicatesStrategy = DuplicatesStrategy.FAIL
-    filesMatching(["**/LICENSE.txt","**/NOTICE.txt"]) {
+    filesMatching(["**/LICENSE.txt","**/NOTICE.txt", "META-INF/**"]) {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
 }
@@ -195,7 +195,7 @@ task harnessJar(type: Jar, dependsOn: translateClasses) {
         attributes 'Main-Class': 'org.javarosa.engine.Harness'
     }
     duplicatesStrategy = DuplicatesStrategy.FAIL
-    filesMatching(["**/LICENSE.txt","**/NOTICE.txt"]) {
+    filesMatching(["**/LICENSE.txt","**/NOTICE.txt", "META-INF/**"]) {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
 }
@@ -223,7 +223,7 @@ task formTranslateJar(type: Jar, dependsOn: translateClasses) {
         attributes 'Main-Class': 'org.javarosa.xform.schema.Harness'
     }
     duplicatesStrategy = DuplicatesStrategy.FAIL
-    filesMatching(["**/LICENSE.txt","**/NOTICE.txt", "**/org.xmlpull.v1.XmlPullParserFactory","org/xmlpull/v1/*"]) {
+    filesMatching(["**/LICENSE.txt","**/NOTICE.txt", "META-INF/**", "**/org.xmlpull.v1.XmlPullParserFactory","org/xmlpull/v1/*"]) {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
 }