Skip to content

Commit dcb7538

Browse files
committed
Merge branch 'sprint' into 'master'
Sprint See merge request open-platform/api!209
2 parents cbec43a + be00bdd commit dcb7538

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [2.6.2] - 2018-08-10
8+
### Changed
9+
- Kotlin version is updated to 1.2.60
10+
711
## [2.6.1] - 2018-08-03
812
### Fixed
913
- Scaffold Creation: Validation on special characters
@@ -145,6 +149,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
145149
- "Withdraw" button is removed
146150

147151
[Unreleased]: https://github.com/OpenFuturePlatform/open-api/compare/master...sprint
152+
[2.6.2]: https://github.com/OpenFuturePlatform/open-api/compare/v2.6.1...v2.6.2
148153
[2.6.1]: https://github.com/OpenFuturePlatform/open-api/compare/v2.6.0...v2.6.1
149154
[2.6.0]: https://github.com/OpenFuturePlatform/open-api/compare/v2.5.0...v2.6.0
150155
[2.5.0]: https://github.com/OpenFuturePlatform/open-api/compare/v2.4.0...v2.5.0

build.gradle

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
plugins {
22
id 'jacoco'
3-
id "idea"
4-
id "org.jetbrains.kotlin.jvm" version "1.2.51"
5-
id "org.jetbrains.kotlin.kapt" version "1.2.51"
6-
id "org.jetbrains.kotlin.plugin.spring" version "1.2.51"
7-
id "org.jetbrains.kotlin.plugin.jpa" version "1.2.51"
8-
id "org.springframework.boot" version "2.0.4.RELEASE"
3+
id 'idea'
4+
id 'org.jetbrains.kotlin.jvm' version '1.2.60'
5+
id 'org.jetbrains.kotlin.kapt' version '1.2.60'
6+
id 'org.jetbrains.kotlin.plugin.spring' version '1.2.60'
7+
id 'org.jetbrains.kotlin.plugin.jpa' version '1.2.60'
8+
id 'org.springframework.boot' version '2.0.4.RELEASE'
9+
id 'com.palantir.git-version' version '0.12.0-rc2'
910
}
1011

11-
apply plugin: "io.spring.dependency-management"
12+
apply plugin: 'io.spring.dependency-management'
1213

13-
group = "io.openfuture.api"
14-
version = "2.6.1"
14+
group = 'io.openfuture.api'
15+
version = versionDetails().lastTag[1..-1] + (versionDetails().isCleanTag ? '' : '-DIRTY')
1516
sourceCompatibility = JavaVersion.VERSION_1_8
1617

1718
repositories {

0 commit comments

Comments
 (0)