Skip to content
This repository has been archived by the owner on Aug 7, 2018. It is now read-only.

Commit

Permalink
Fix version format
Browse files Browse the repository at this point in the history
  • Loading branch information
jcornaz committed Apr 5, 2017
1 parent 55f9a9c commit b6ba2ff
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Change log
## 1.0.1 (2017-04-05)
### Fixed
* Version number format returned by the `GET /` and `GET /version`

## 1.0.0 (2017-04-05)
### Dependencies changes
#### Updated
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Balotaro
[![GPLv3](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://raw.githubusercontent.com/slimaku/balotaro/master/LICENSE)
[![Version](https://img.shields.io/badge/version-1.0.0-brightgreen.svg)](https://github.com/slimaku/balotaro/releases/tag/v1.0-rc1)
[![Version](https://img.shields.io/badge/version-1.0.1-brightgreen.svg)](https://github.com/slimaku/balotaro/releases/tag/v1.0-rc1)
[![Build Status](https://travis-ci.org/slimaku/balotaro.svg?branch=master)](https://travis-ci.org/slimaku/balotaro)
[![Codebeat](https://codebeat.co/badges/04435b31-0902-4b20-b315-138e4e7d8562)](https://codebeat.co/projects/github-com-slimaku-balotaro)
[![Issues](https://img.shields.io/github/issues/slimaku/balotaro.svg)](https://github.com/slimaku/balotaro/issues)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'balotenketo'
version '1.0'
version '1.0.1'

buildscript {
ext {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/balotenketo/balotaro/Version.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ object Version {
val minor = 0

@ApiModelProperty("Patch version (null if it is a pre-release)")
val patch: Int? = 0
val patch: Int? = 1

@ApiModelProperty("Pre-release label (null if it is not a pre-release)")
val label: String? = null

@ApiModelProperty("True if it is a pre-release and false otherwise. (Pre-releases shouldn't be used in production)")
val isPreRelease = label != null

override fun toString() = "$major.$minor${patch ?: "-$label"}"
override fun toString() = "$major.$minor.${patch ?: "-$label"}"
}

0 comments on commit b6ba2ff

Please sign in to comment.