0.9.0 #11

Merged
altavir merged 18 commits from dev into master 2021-03-07 09:59:51 +03:00
3 changed files with 31 additions and 4 deletions
Showing only changes of commit 4b90233286 - Show all commits

View File

@ -8,6 +8,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Added ### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security
## [0.9.0]
### Added
- Skip sonatype publishing for dev versions
### Changed ### Changed
- Publishing repositories are explicit and defined in the top level project - Publishing repositories are explicit and defined in the top level project
- Paths to publishing properties now use dot notation like `publishing.github.user` - Paths to publishing properties now use dot notation like `publishing.github.user`

View File

@ -8,7 +8,7 @@ plugins {
} }
group = "ru.mipt.npm" group = "ru.mipt.npm"
version = "0.9.0-dev-1" version = "0.9.0"
description = "Build tools for DataForge and kscience projects" description = "Build tools for DataForge and kscience projects"

View File

@ -110,7 +110,10 @@ internal fun Project.addGithubPublishing(
githubOrg: String, githubOrg: String,
githubProject: String githubProject: String
) { ) {
if (requestPropertyOrNull("publishing.github") == "false") return if (requestPropertyOrNull("publishing.github") == "false") {
logger.info("Skipping github publishing based on flag value")
return
}
val githubUser: String = requestProperty("publishing.github.user") val githubUser: String = requestProperty("publishing.github.user")
val githubToken: String = requestProperty("publishing.github.token") val githubToken: String = requestProperty("publishing.github.token")
@ -137,7 +140,10 @@ internal fun Project.addGithubPublishing(
} }
internal fun Project.addSpacePublishing(spaceRepo: String) { internal fun Project.addSpacePublishing(spaceRepo: String) {
if (requestPropertyOrNull("publishing.space") == "false") return if (requestPropertyOrNull("publishing.space") == "false") {
logger.info("Skipping space publishing based on flag value")
return
}
val spaceUser: String = requestProperty("publishing.space.user") val spaceUser: String = requestProperty("publishing.space.user")
val spaceToken: String = requestProperty("publishing.space.token") val spaceToken: String = requestProperty("publishing.space.token")
@ -165,7 +171,14 @@ internal fun Project.addSpacePublishing(spaceRepo: String) {
} }
internal fun Project.addSonatypePublishing() { internal fun Project.addSonatypePublishing() {
if (requestPropertyOrNull("publishing.sonatype") == "false") return if(isSnapshot()){
logger.info("Sonatype publishing skipped for dev version")
return
}
if (requestPropertyOrNull("publishing.sonatype") == "false") {
logger.info("Skipping sonatype publishing based on flag value")
return
}
val sonatypeUser: String = requestProperty("publishing.sonatype.user") val sonatypeUser: String = requestProperty("publishing.sonatype.user")
val sonatypePassword: String = requestProperty("publishing.sonatype.password") val sonatypePassword: String = requestProperty("publishing.sonatype.password")