Sets the duplicate strategy to exclude in all zip tasks (#85)

This commit is contained in:
Fredric Silberberg
2016-07-30 21:07:21 -07:00
committed by Peter Johnson
parent 30fbfe46e6
commit 0f9f7309e3
3 changed files with 9 additions and 0 deletions

View File

@@ -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
}

View File

@@ -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'

View File

@@ -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'