Skip to content

Commit 322f2a6

Browse files
eyalbe4eyalbe4
eyalbe4
authored and
eyalbe4
committed
Ignore missing bintray environment in root project. #74
1 parent 0c322da commit 322f2a6

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/main/groovy/com/jfrog/bintray/gradle/BintrayUploadTask.groovy

+15-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ class BintrayUploadTask extends DefaultTask {
3535
String apiUrl
3636

3737
@Input
38+
@Optional
3839
String user
3940

4041
@Input
42+
@Optional
4143
String apiKey
4244

4345
@Input
@@ -66,9 +68,11 @@ class BintrayUploadTask extends DefaultTask {
6668
String userOrg
6769

6870
@Input
71+
@Optional
6972
String repoName
7073

7174
@Input
75+
@Optional
7276
String packageName
7377

7478
@Input
@@ -169,6 +173,10 @@ class BintrayUploadTask extends DefaultTask {
169173
@TaskAction
170174
void bintrayUpload() {
171175
logger.info("Gradle Bintray Plugin version: $pluginVersion");
176+
if (shouldSkip()) {
177+
logger.info("Skipping task {}", this.project.name);
178+
return
179+
}
172180

173181
//TODO: [by yl] replace with findResults for Gradle 2.x
174182
configurationUploads = configurations.collect {
@@ -465,6 +473,10 @@ class BintrayUploadTask extends DefaultTask {
465473
}
466474
}
467475

476+
boolean shouldSkip() {
477+
return (user == null || apiKey == null)
478+
}
479+
468480
String getPluginVersion() {
469481
if (!releaseProps) {
470482
Properties tempProps = new Properties()
@@ -550,7 +562,9 @@ class BintrayUploadTask extends DefaultTask {
550562
List<BintrayUploadTask> tasks = new ArrayList<BintrayUploadTask>()
551563
for (Task task : getProject().getGradle().getTaskGraph().getAllTasks()) {
552564
if (task instanceof BintrayUploadTask) {
553-
tasks.add(task);
565+
if (!task.shouldSkip()) {
566+
tasks.add(task);
567+
}
554568
}
555569
}
556570
bintrayUploadTasks = tasks

0 commit comments

Comments
 (0)