Merge branch 'sprint' into 'master'

Sprint to Master

Closes OP-159

See merge request open-platform/api!198

Author: evgeny-krylov

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.6.0] - 2018-08-02
+### Added
+- Payment widget. Now you can pay a scaffold using a widget.
+- Widget: an iFrame element for embedding the payment widget to the seller's website
+- Widget: Browser detecting logic
+- Widget: Error tips
+- Widget: Web3 script with required functionality
+
 ## [2.5.0] - 2018-07-27
 ### Added
 - Scaffold v2
@@ -134,6 +142,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - "Withdraw" button is removed
 
 [Unreleased]: https://github.com/OpenFuturePlatform/open-api/compare/master...sprint
+[2.6.0]: https://github.com/OpenFuturePlatform/open-api/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/OpenFuturePlatform/open-api/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/OpenFuturePlatform/open-api/compare/v2.3.0...v2.4.0
 [2.3.0]: https://github.com/OpenFuturePlatform/open-api/compare/v2.2.1...v2.3.0

build.gradle

@@ -5,13 +5,13 @@ plugins {
     id "org.jetbrains.kotlin.kapt" version "1.2.51"
     id "org.jetbrains.kotlin.plugin.spring" version "1.2.51"
     id "org.jetbrains.kotlin.plugin.jpa" version "1.2.51"
-    id "org.springframework.boot" version "2.0.3.RELEASE"
+    id "org.springframework.boot" version "2.0.4.RELEASE"
 }
 
 apply plugin: "io.spring.dependency-management"
 
 group = "io.openfuture.api"
-version = "2.5.0"
+version = "2.6.0"
 sourceCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
@@ -62,6 +62,7 @@ dependencies {
 sourceSets {
     main.kotlin.srcDirs += 'src/main/kotlin'
     main.resources.srcDirs += 'frontend/build/resources'
+    main.resources.srcDirs += 'widget/build/resources'
 }
 
 // Kotlin
@@ -100,4 +101,5 @@ jacocoTestReport {
 check.dependsOn jacocoTestReport
 
 // Front
-processResources.dependsOn(':frontend:assemble')
+processResources.dependsOn(':frontend:assemble')
+processResources.dependsOn(':widget:assemble')