🐔 upgrade: Kotlin 1.1.60 , Gradle 4.4

Author: xmlking

README.md

@@ -30,7 +30,7 @@ This sample application showcases patterns to implement better **Observability**
 * Docker deployment
 
 ### Prerequisites
-1. Gradle 4 (Install via [sdkman](http://sdkman.io/))
+1. Gradle 4.4 (Install via [sdkman](http://sdkman.io/))
 2. Docker for Mac [Setup Instructions](./docs/docker.md)
 
 ### Build
@@ -105,6 +105,7 @@ docker ps
 ```bash
 # upgrade project gradle version
 gradle wrapper --gradle-version 4.3 --distribution-type all
+gradle wrapper --gradle-version 4.4-rc-1 --distribution-type all
 # gradle daemon status 
 gradle --status
 gradle --stop

build.gradle.kts

@@ -6,21 +6,8 @@ val logbackKafkaAppenderVersion by project
 val logstashLogbackEncoderVersion by project
 val kafkaVersion by project
 
-//uncomment this block for first time and run `./gradlew clean`, then you can remove this block. https://github.com/gradle/kotlin-dsl/issues/547
-//buildscript {
-//    val springBootVersion = "2.0.0.M6"
-//
-//    repositories {
-//        mavenCentral()
-//        maven("https://repo.spring.io/milestone")
-//    }
-//    dependencies {
-//        classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-//    }
-//}
-
 plugins {
-    val kotlinVersion = "1.1.51"
+    val kotlinVersion = "1.1.60"
     val springDependencyManagement = "1.0.3.RELEASE"
     val springBootVersion = "2.0.0.M6" //TODO: "2.0.0.RELEASE"
     val junitGradleVersion = "1.0.1"

cassandra-data-service/src/main/kotlin/com/example/domain/GuestBookEntry.kt

@@ -1,5 +1,6 @@
 package com.example.domain
 
+import com.fasterxml.jackson.annotation.JsonFormat
 import com.datastax.driver.core.utils.UUIDs
 import org.springframework.data.cassandra.core.cql.PrimaryKeyType.*
 import org.springframework.data.cassandra.core.cql.Ordering
@@ -15,6 +16,7 @@ data class GuestBookEntry(
         @PrimaryKeyColumn(type = PARTITIONED, ordinal = 0)
         val name: String,
         val comment: String,
+        //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "en_US", timezone = "America/Los_Angeles")
         @PrimaryKeyColumn(type = CLUSTERED, ordinal = 1,  ordering = Ordering.DESCENDING)
         val time: LocalDateTime  = LocalDateTime.now()
-)
+)

gradle.properties

@@ -3,7 +3,7 @@ description=Open Compute Showcase Apps
 version=0.1.0-SNAPSHOT
 
 # kotlin
-kotlinVersion=1.1.51
+kotlinVersion=1.1.60
 spekVersion=1.0.89
 mockitoVersion=2.1.0-beta.125
 mockitoKotlinVersion=0.6.1

gradle/wrapper/gradle-wrapper.jar

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-rc-1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url "https://repo.spring.io/milestone" }
-        maven { url "https://jcenter.bintray.com/" }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        maven { url = uri("https://jcenter.bintray.com/") }
     }
 
     resolutionStrategy {
@@ -16,5 +16,4 @@ pluginManagement {
         }
     }
 }
-
-include 'shared', 'cassandra-data-service', 'stream-service', 'ui-app', 'kafka-influxdb-service'
+include("shared", "cassandra-data-service", "stream-service", "ui-app", "kafka-influxdb-service")

settings.gradle settings.gradle.kts

@@ -24,9 +24,11 @@ import java.time.Instant
 import java.util.*
 import kotlin.coroutines.experimental.buildIterator
 import reactor.kafka.receiver.KafkaReceiver
-//import org.springframework.context.support.*
 import org.slf4j.MDC
+import org.springframework.boot.ApplicationRunner
+import org.springframework.boot.builder.SpringApplicationBuilder
 import org.springframework.boot.runApplication
+import org.springframework.context.support.beans
 
 @SpringBootApplication
 class StreamApplication
@@ -160,10 +162,18 @@ class QuoteGenerator {
 
 fun main(args: Array<String>) {
     runApplication<StreamApplication>(*args)
-//    SpringApplication(Application::class.java).apply {
-//        addInitializers(beans())
-//        run(*args)
-//    }
+//    SpringApplicationBuilder().initializers(
+//        beans {
+//            bean {
+//                ApplicationRunner {
+//                    val quoteGenerator = ref<QuoteGenerator>()
+//                    // to something
+//                }
+//            }
+//        }
+//    )
+//        .sources(StreamApplication::class.java)
+//        .run(*args)
 }
 
 

stream-service/src/main/kotlin/com/example/StreamApplication.kt

@@ -1,5 +1,13 @@
 server:
   port: ${PORT:8082}
+#  port: ${PORT:8482}
+#  http2:
+#    enabled: true
+#  ssl:
+#    key-store: classpath:keystore.jks
+#    key-store-password: secret
+#    key-password: password
+
 #logging:
 #  level:
 #    root: debug