Spring Boot 2.0

build.gradle

@@ -1,18 +1,36 @@
+buildscript {
+  repositories {
+    jcenter()
+    // TODO: remove when 2.0.0 is released
+    maven { url 'https://repo.spring.io/libs-milestone' }
+  }
+  dependencies {
+    classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M6'
+  }
+}
+
 plugins {
   id 'org.jetbrains.kotlin.jvm' version '1.1.51'
-  id 'org.springframework.boot' version '1.5.8.RELEASE'
+  //id 'org.springframework.boot' version '2.0.0.RELEASE'
   id 'org.hidetake.appengine.spring.boot' version '1.1'
 }
 
+// TODO: remove when 2.0.0 is released
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
+
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
   jcenter()
+  // TODO: remove when 2.0.0 is released
+  maven { url 'https://repo.spring.io/libs-milestone' }
 }
 
 dependencies {
   compile 'org.jetbrains.kotlin:kotlin-stdlib'
+  compile 'org.jetbrains.kotlin:kotlin-reflect'
 
   compile 'org.springframework.boot:spring-boot-starter-web'
   compile 'org.springframework.boot:spring-boot-starter-thymeleaf'

circle.yml

@@ -32,9 +32,7 @@ jobs:
       - deploy:
           name: Deploy
           command: |
-            if [ "$CIRCLE_BRANCH" = "master" ]; then
-              echo "$GCP_SERVICE_ACCOUNT_KEY" | base64 -d > "$HOME/gcp-service-account-key.json"
-              gcloud auth activate-service-account --key-file "$HOME/gcp-service-account-key.json"
-              gcloud config set project "$GCP_PROJECT_ID"
-              ./gradlew appengineDeploy
-            fi
+            echo "$GCP_SERVICE_ACCOUNT_KEY" | base64 -d > "$HOME/gcp-service-account-key.json"
+            gcloud auth activate-service-account --key-file "$HOME/gcp-service-account-key.json"
+            gcloud config set project "$GCP_PROJECT_ID"
+            ./gradlew appengineDeploy

src/main/kotlin/example/App.kt

@@ -1,7 +1,12 @@
 package example
 
+import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.web.support.SpringBootServletInitializer
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 
 @SpringBootApplication
 open class App : SpringBootServletInitializer()
+
+fun main(args: Array<String>) {
+    SpringApplication.run(App::class.java, *args)
+}