[FAB-16707] Remove Gradle warnings

Simon Stone · Simon Stone · commit a3304ec29c8f · 2019-09-26T10:11:03.000+01:00
Both Jacoco and Docker are causing Gradle warnings. Fix the
Jacoco configuration, and update the Docker plugin for Gradle.

Signed-off-by: Simon Stone &lt;sstone1@uk.ibm.com&gt;
Change-Id: I4ace2213580f9e8598f7f284fab7443e353471c8
diff --git a/fabric-chaincode-docker/build.gradle b/fabric-chaincode-docker/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.bmuschko:gradle-docker-plugin:4.10.0'
+        classpath 'com.bmuschko:gradle-docker-plugin:5.1.0'
     }
 }
 
diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle
@@ -67,7 +67,7 @@ jacoco {
 
 jacocoTestReport {
     afterEvaluate {
-        classDirectories = files(classDirectories.files.collect {
+        classDirectories.from = files(classDirectories.files.collect {
             fileTree(dir: it, exclude: 'org/hyperledger/fabric/protos/**')
         })
     }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ buildscript {`
`13`	`13`	`mavenCentral()`
`14`	`14`	`}`
`15`	`15`	`dependencies {`
`16`		`- classpath 'com.bmuschko:gradle-docker-plugin:4.10.0'`
	`16`	`+ classpath 'com.bmuschko:gradle-docker-plugin:5.1.0'`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ jacoco {`
`67`	`67`
`68`	`68`	`jacocoTestReport {`
`69`	`69`	`afterEvaluate {`
`70`		`- classDirectories = files(classDirectories.files.collect {`
	`70`	`+ classDirectories.from = files(classDirectories.files.collect {`
`71`	`71`	`fileTree(dir: it, exclude: 'org/hyperledger/fabric/protos/**')`
`72`	`72`	`})`
`73`	`73`	`}`