From 0c38d1877ae50f41a57ab3e7e4958bedd8db06da Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Tue, 20 Nov 2018 13:20:45 -0800 Subject: [PATCH] buildscripts: Add CI for kotlin non-android - add CI for kotlin non-android - bump kotlin version to fix kotlin compiler issue on jdk11 - add javax.annotation dep to fix kotlin build on jdk 9 & 11 Fixes #4725 --- .travis.yml | 1 + examples/example-kotlin/android/helloworld/build.gradle | 2 +- examples/example-kotlin/build.gradle | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1d8b58aa3..6d419b24d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ install: - ./gradlew assemble generateTestProto install - pushd examples && ./gradlew build && popd - pushd examples && mvn verify && popd + - pushd examples/example-kotlin && ./gradlew build && popd before_script: - test -z "$(git status --porcelain)" || (git status && echo Error Working directory is not clean. Forget to commit generated files? && false) diff --git a/examples/example-kotlin/android/helloworld/build.gradle b/examples/example-kotlin/android/helloworld/build.gradle index ef4b2a1993..bc18658831 100644 --- a/examples/example-kotlin/android/helloworld/build.gradle +++ b/examples/example-kotlin/android/helloworld/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.21' + ext.kotlin_version = '1.3.10' repositories { google() diff --git a/examples/example-kotlin/build.gradle b/examples/example-kotlin/build.gradle index ee8fc90d75..dd28642a79 100644 --- a/examples/example-kotlin/build.gradle +++ b/examples/example-kotlin/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'application' buildscript { - ext.kotlin_version = '1.2.21' + ext.kotlin_version = '1.3.10' repositories { mavenCentral() @@ -43,6 +43,7 @@ dependencies { compile "io.grpc:grpc-netty-shaded:${grpcVersion}" compile "io.grpc:grpc-protobuf:${grpcVersion}" compile "io.grpc:grpc-stub:${grpcVersion}" + compileOnly "javax.annotation:javax.annotation-api:1.2" testCompile "io.grpc:grpc-testing:${grpcVersion}" // gRCP testing utilities testCompile "junit:junit:4.12"