From 5ffe15d5ffd991ac26c1b37d5ac6b5c0db85ccce Mon Sep 17 00:00:00 2001 From: Thad House Date: Wed, 4 Sep 2019 13:06:46 -0700 Subject: [PATCH] Remove ability to build all combined artifacts (#1867) --- shared/config.gradle | 27 --------------------------- shared/jni/publish.gradle | 9 --------- 2 files changed, 36 deletions(-) diff --git a/shared/config.gradle b/shared/config.gradle index 986ed48664..727c891a73 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -111,33 +111,6 @@ ext.createComponentZipTasks = { components, names, base, type, project, func -> return taskList } -ext.createAllCombined = { list, name, base, type, project -> - def outputsFolder = file("$project.buildDir/outputs") - - def task = project.tasks.create(base + "-all", type) { - description = "Creates component archive for all classifiers" - destinationDir = outputsFolder - classifier = "all" - baseName = base - duplicatesStrategy = 'exclude' - - list.each { - if (it.name.endsWith('debug')) return - from project.zipTree(it.archivePath) - dependsOn it - } - } - - project.build.dependsOn task - - project.artifacts { - task - } - - return task - -} - ext.includeStandardZipFormat = { task, value -> value.each { binary -> if (binary.buildable) { diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle index 99c36851d5..e50f87e15e 100644 --- a/shared/jni/publish.gradle +++ b/shared/jni/publish.gradle @@ -88,11 +88,6 @@ model { } }) - def allJniTask - if (!project.hasProperty('jenkinsBuild')) { - allJniTask = createAllCombined(jniTaskList, "${nativeName}JNI", jniBaseName, Jar, project) - } - publications { cpp(MavenPublication) { taskList.each { @@ -110,10 +105,6 @@ model { artifact it } - if (!project.hasProperty('jenkinsBuild')) { - artifact allJniTask - } - artifactId = "${baseArtifactId}-jni" groupId artifactGroupId version wpilibVersioning.version.get()