feature/markNextVersionTask-creates-next-version-with-incrementer #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Owner
jplucinski
commented
May 14, 2018
jplucinski
commented
- markNextVersionTask can create next version with incrementer
* markNextVersionTask can create next version with incrementer
pun-ky
reviewed
May 14, 2018
| def version = nextVersionRules.nextVersion | ||
| def currentVersion = Version.valueOf(versionConfig.version) | ||
|
|
||
| if (nextVersionRules.versionIncrementer){ |
pun-ky
reviewed
May 14, 2018
| @@ -64,7 +64,7 @@ enum PredefinedVersionIncrementer { | |||
| PredefinedVersionIncrementer creator = values().find { it.name == name } | |||
| if (creator == null) { | |||
| throw new IllegalArgumentException("There is no predefined version incrementer with $name name. " + | |||
| "You can choose from: ${values().collect { it.name }}"); | |||
There was a problem hiding this comment.
crucial changes ;) that semicolons...
pun-ky
reviewed
May 14, 2018
| @@ -47,6 +47,10 @@ class ScmService { | |||
| } | |||
| } | |||
|
|
|||
| ScmPosition position(){ | |||
pun-ky
approved these changes
May 14, 2018
docs/configuration/next_version.rst
Outdated
| # ./gradlew cV | ||
| 2.0.0-SNAPSHOT | ||
|
|
||
| To create next version marker use ``markNextVersion`` task along with obligatory command line option ``release.version``. | ||
| To create next version marker use ``markNextVersion``. Without parameters next version will be created with default version incrementer - incrementMinor, | ||
| witch can be overwritten with ``release.incrementer`` parameter. |
docs/configuration/next_version.rst
Outdated
| # ./gradlew cV | ||
| 2.0.0-SNAPSHOT | ||
|
|
||
| To create next version marker use ``markNextVersion`` task along with obligatory command line option ``release.version``. | ||
| To create next version marker use ``markNextVersion``. Without parameters next version will be created with default version incrementer - incrementMinor, |
There was a problem hiding this comment.
it's not Markdown, https://pl.wikipedia.org/wiki/ReStructuredText
| def version = nextVersionRules.nextVersion | ||
| def currentVersion = Version.valueOf(versionConfig.version) | ||
|
|
||
| if (nextVersionRules.versionIncrementer){ |
| @@ -47,6 +47,10 @@ class ScmService { | |||
| } | |||
| } | |||
|
|
|||
| ScmPosition position(){ | |||
| if (nextVersion == null && project.hasProperty(DEPRECATED_NEXT_VERSION_PROPERTY)) { | ||
| project.logger.warn("Using deprecated parameter: $DEPRECATED_NEXT_VERSION_PROPERTY! Use $NEXT_VERSION_PROPERTY instead.") | ||
| nextVersion = project.property(DEPRECATED_NEXT_VERSION_PROPERTY) | ||
| } | ||
|
|
||
| return new NextVersionProperties(nextVersion: nextVersion, suffix: config.suffix, separator: config.separator, | ||
| return new NextVersionProperties(nextVersion: nextVersion, versionIncrementer: nextVersionIncrementer, suffix: config.suffix, separator: config.separator, |
There was a problem hiding this comment.
This is technically a public constructor. How will it behave if we omit this parameter?
There was a problem hiding this comment.
I updated all references, moreover in project instances of NextVersionfactory are created with builder NextVersionPropertiesBuilder.
* added examples in doc * fixed formatting
* using undecorated version for incrementer * more explicit logic * services clean up
* move incrementer resolving to nextversionmaker * fix for unit test
Bug in integration tests setup code caused project.version to be assigned before adding custom code. This means that no version reading customizations were active in integraiton tests.
This enables better testing and isolation for pretty sophisticated version sorting logic.
Specifies precedence of tags when multiple tags on single commit: * when on head: use highest normal; if no normal - first alpha * otherwise: use highest of all
…ersion-with-incrementer
* remove VersionConfig dependencies from NextVersionPropertiesFactory
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.