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

Upgrade to Gradle 5

This commit is contained in:
Eric Anderson 2019-06-07 08:40:53 -07:00 committed by GitHub
parent a284cff892
commit 26bd76fa76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
all/build.gradle
View File

@ -63,10 +63,9 @@ jacocoTestReport {
html.enabled = true html.enabled = true
} }
additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs) additionalSourceDirs.from(files(subprojects.sourceSets.main.allSource.srcDirs))
sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs) sourceDirectories.from(files(subprojects.sourceSets.main.allSource.srcDirs))
classDirectories = files(subprojects.sourceSets.main.output) classDirectories.from(files(subprojects.sourceSets.main.output).collect {
classDirectories = files(classDirectories.files.collect {
fileTree(dir: it, fileTree(dir: it,
exclude: [ exclude: [
'**/io/grpc/internal/testing/**', '**/io/grpc/internal/testing/**',

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.google.gradle:osdetector-gradle-plugin:1.4.0' classpath 'com.google.gradle:osdetector-gradle-plugin:1.4.0'
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.5' classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0'
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.6' classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.6'
classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.5" classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.5"
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.2.5' classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.2.5'

2
cronet/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
google() google()
jcenter() jcenter()
} }
dependencies { classpath 'com.android.tools.build:gradle:3.0.1' } dependencies { classpath 'com.android.tools.build:gradle:3.3.0' }
} }
allprojects { allprojects {

1
cronet/settings.gradle Normal file
View File

@ -0,0 +1 @@
rootProject.name = 'grpc-cronet'

2
examples/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

6
okhttp/build.gradle
View File

@ -2,9 +2,13 @@ description = "gRPC: OkHttp"
dependencies { dependencies {
compile project(':grpc-core'), compile project(':grpc-core'),
libraries.okhttp,
libraries.okio libraries.okio
compile (libraries.okhttp) {
// prefer 1.13.0 from libraries instead of 1.6.0
exclude group: 'com.squareup.okio', module: 'okio'
}
// Tests depend on base class defined by core module. // Tests depend on base class defined by core module.
testCompile project(':grpc-core').sourceSets.test.output, testCompile project(':grpc-core').sourceSets.test.output,
project(':grpc-testing'), project(':grpc-testing'),

3
settings.gradle
View File

@ -49,6 +49,3 @@ if (settings.hasProperty('skipCodegen') && skipCodegen.toBoolean()) {
include ":grpc-compiler" include ":grpc-compiler"
project(':grpc-compiler').projectDir = "$rootDir/compiler" as File project(':grpc-compiler').projectDir = "$rootDir/compiler" as File
} }
// Gradle 5.0 changed the behavior of publishing block, use new stable behavior
enableFeaturePreview('STABLE_PUBLISHING')