grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
ZHANG Dapeng 2018-11-20 13:20:45 -08:00 committed by GitHub
parent 268793f321
commit 0c38d1877a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -23,6 +23,7 @@ install:
- ./gradlew assemble generateTestProto install - ./gradlew assemble generateTestProto install
- pushd examples && ./gradlew build && popd - pushd examples && ./gradlew build && popd
- pushd examples && mvn verify && popd - pushd examples && mvn verify && popd
- pushd examples/example-kotlin && ./gradlew build && popd
before_script: before_script:
- test -z "$(git status --porcelain)" || (git status && echo Error Working directory is not clean. Forget to commit generated files? && false) - test -z "$(git status --porcelain)" || (git status && echo Error Working directory is not clean. Forget to commit generated files? && false)

2
examples/example-kotlin/android/helloworld/build.gradle
View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.21' ext.kotlin_version = '1.3.10'
repositories { repositories {
google() google()

3
examples/example-kotlin/build.gradle
View File

@ -13,7 +13,7 @@ apply plugin: 'application'
buildscript { buildscript {
ext.kotlin_version = '1.2.21' ext.kotlin_version = '1.3.10'
repositories { repositories {
mavenCentral() mavenCentral()
@ -43,6 +43,7 @@ dependencies {
compile "io.grpc:grpc-netty-shaded:${grpcVersion}" compile "io.grpc:grpc-netty-shaded:${grpcVersion}"
compile "io.grpc:grpc-protobuf:${grpcVersion}" compile "io.grpc:grpc-protobuf:${grpcVersion}"
compile "io.grpc:grpc-stub:${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 "io.grpc:grpc-testing:${grpcVersion}" // gRCP testing utilities
testCompile "junit:junit:4.12" testCompile "junit:junit:4.12"