Upgrade to Gradle 5

all/build.gradle

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

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         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 "me.champeau.gradle:jmh-gradle-plugin:0.4.5"
         classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.2.5'

cronet/build.gradle

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

cronet/settings.gradle

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

examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 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
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 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
 zipStorePath=wrapper/dists

okhttp/build.gradle

@@ -2,9 +2,13 @@ description = "gRPC: OkHttp"
 
 dependencies {
     compile project(':grpc-core'),
-            libraries.okhttp,
             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.
     testCompile project(':grpc-core').sourceSets.test.output,
             project(':grpc-testing'),

settings.gradle

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