From 0f9f7309e380fe8a450eadd39149b937d91d8ed2 Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <333fred@users.noreply.github.com>
Date: Sat, 30 Jul 2016 21:07:21 -0700
Subject: [PATCH] Sets the duplicate strategy to exclude in all zip tasks (#85)

---
 java/java.gradle | 5 +++++
 ntcore.gradle    | 2 ++
 wpiutil.gradle   | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/java/java.gradle b/java/java.gradle
index 2b4b958c12..0193ec7c4c 100644
--- a/java/java.gradle
+++ b/java/java.gradle
@@ -25,6 +25,7 @@ jar {
     description = 'Generates NetworkTables jar, with the JNI shared libraries embedded'
     baseName = 'ntcore'
     classifier = "$buildPlatform"
+    duplicatesStrategy = 'exclude'
 
     dependsOn { classes }
     model {
@@ -52,6 +53,8 @@ task networktablesJavaSource(type: Jar, dependsOn: classes) {
     group = 'WPILib'
     baseName = 'ntcore'
     classifier = "sources"
+    duplicatesStrategy = 'exclude'
+
     from sourceSets.main.allJava
 }
 
@@ -60,6 +63,8 @@ task networktablesJavadoc(type: Jar, dependsOn: javadoc) {
     group = 'WPILib'
     baseName = 'ntcore'
     classifier = "javadoc"
+    duplicatesStrategy = 'exclude'
+
     from javadoc.destinationDir
 }
 
diff --git a/ntcore.gradle b/ntcore.gradle
index 6e6c00adb3..a17d68073d 100644
--- a/ntcore.gradle
+++ b/ntcore.gradle
@@ -58,6 +58,7 @@ def ntcoreZipTask = { project ->
         destinationDir = project.buildDir
         baseName = 'ntcore'
         classifier = "${project.buildPlatform}"
+        duplicatesStrategy = 'exclude'
 
         from(file('include')) {
             into 'include'
@@ -143,6 +144,7 @@ task ntcoreSourceZip(type: Zip) {
     destinationDir = project.buildDir
     baseName = 'ntcore'
     classifier = "sources"
+    duplicatesStrategy = 'exclude'
 
     from('src') {
         into 'src'
diff --git a/wpiutil.gradle b/wpiutil.gradle
index bd34177e6a..1cdfe8650e 100644
--- a/wpiutil.gradle
+++ b/wpiutil.gradle
@@ -35,6 +35,7 @@ def wpiutilZipTask = { project ->
         destinationDir = project.buildDir
         baseName = 'wpiutil'
         classifier = "${project.buildPlatform}"
+        duplicatesStrategy = 'exclude'
 
         from(file('wpiutil/include')) {
             into 'include'
@@ -101,6 +102,7 @@ task wpiutilSourceZip(type: Zip) {
     destinationDir = project.buildDir
     baseName = 'wpiutil'
     classifier = "sources"
+    duplicatesStrategy = 'exclude'
 
     from('wpiutil/src') {
         into 'src'