0.10.0 #16

Merged
altavir merged 17 commits from dev into master 2021-06-19 14:12:34 +03:00
Showing only changes of commit e0d331d4d4 - Show all commits

View File

@ -35,10 +35,11 @@ class KSciencePublishingExtension(val project: Project) {
project.addGithubPublishing(githubOrg, githubProject) project.addGithubPublishing(githubOrg, githubProject)
if (publish) { if (publish) {
val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToGithubRepository") project.tasks.findByName("publish${project.publicationTarget}ToGithubRepository")?.let {publicationTask->
releaseTask?.dependsOn(publicationTask) releaseTask?.dependsOn(publicationTask)
} }
} }
}
private val releaseTask by lazy { private val releaseTask by lazy {
project.tasks.findByName("release") project.tasks.findByName("release")
@ -51,10 +52,11 @@ class KSciencePublishingExtension(val project: Project) {
require(initializedFlag) { "The project vcs is not set up use 'vcs' method to do so" } require(initializedFlag) { "The project vcs is not set up use 'vcs' method to do so" }
project.addSpacePublishing(spaceRepo) project.addSpacePublishing(spaceRepo)
if (publish) { if (publish) {
val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToSpaceRepository") project.tasks.findByName("publish${project.publicationTarget}ToSpaceRepository")?.let { publicationTask ->
releaseTask?.dependsOn(publicationTask) releaseTask?.dependsOn(publicationTask)
} }
} }
}
// // Bintray publishing // // Bintray publishing
// var bintrayOrg: String? by project.extra // var bintrayOrg: String? by project.extra
@ -69,10 +71,12 @@ class KSciencePublishingExtension(val project: Project) {
require(initializedFlag) { "The project vcs is not set up use 'vcs' method to do so" } require(initializedFlag) { "The project vcs is not set up use 'vcs' method to do so" }
project.addSonatypePublishing() project.addSonatypePublishing()
if (publish) { if (publish) {
val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToSonatypeRepository") project.tasks.findByName("publish${project.publicationTarget}ToSonatypeRepository")
?.let { publicationTask ->
releaseTask?.dependsOn(publicationTask) releaseTask?.dependsOn(publicationTask)
} }
} }
}
} }