Skip to content

Commit

Permalink
4.0.0 prepwork, remove logging
Browse files Browse the repository at this point in the history
  • Loading branch information
rspieldenner committed Aug 9, 2017
1 parent 895d77f commit a4032bd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
4.0.0 / 2017-08-08
4.0.0 / 2017-08-09
==================

* BREAKING: Swap candidate to default to publish to candidate repo
* BREAKING: Requires jdk8

3.5.2 / 2016-11-11
==================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,9 @@ class PublishingPlugin implements Plugin<Project> {
bintray.pkg.with {
if (shouldUseCandidateRepo(project)) {
repo = 'oss-candidate'
project.logger.lifecycle('TRACER: Set to oss-candidate repo')
version.mavenCentralSync.sync = false
} else {
repo = 'maven'
project.logger.lifecycle('TRACER: Set to maven repo')
}
userOrg = 'netflixoss'
licenses = ['Apache-2.0']
Expand Down Expand Up @@ -108,19 +106,15 @@ class PublishingPlugin implements Plugin<Project> {
}

static Boolean shouldUseCandidateRepo(Project project) {
project.logger.lifecycle("TRACER: ${project.gradle.startParameter.taskNames.toString()}")
if (!(project.gradle.startParameter.taskNames.contains('candidate') || project.gradle.startParameter.taskNames.contains(':candidate'))) {
project.logger.lifecycle('TRACER: returning false as no candidate task')
return false
}

if (project.hasProperty(NETFLIXOSS_ALT_CANDIDATE_REPO)) {
def myproperty = project.property(NETFLIXOSS_ALT_CANDIDATE_REPO)
project.logger.lifecycle("TRACER: returning ${myproperty.toString()}")
return (myproperty instanceof String) ? myproperty.toBoolean() : myproperty
}

project.logger.lifecycle('TRACER: returning true')
return true
}
}

0 comments on commit a4032bd

Please sign in to comment.