Skip to content

Commit 90bd1f8

Browse files
authored
Merge pull request #170 from kemi04/gradle
Gradle wrapper updated to the latest version
2 parents e856751 + f1d6b7d commit 90bd1f8

6 files changed

Lines changed: 62 additions & 45 deletions

File tree

ci/checkstyle/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<property name="message" value="Line has trailing spaces."/>
120120
</module>
121121
<module name="RegexpHeader">
122-
<property name="headerFile" value="${config_loc}/java-copyright-header.txt"/>
122+
<property name="headerFile" value="${root_dir}/ci/checkstyle/java-copyright-header.txt"/>
123123
<property name="fileExtensions" value="java"/>
124124
</module>
125125
</module>

fabric-chaincode-shim/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'org.owasp.dependencycheck'
2525
checkstyle {
2626
toolVersion '8.29'
2727
configFile file("../ci/checkstyle/checkstyle.xml")
28-
configProperties = [config_loc: file("../ci/checkstyle") ]
28+
configProperties = [root_dir: file("..") ]
2929
}
3030
checkstyleMain {
3131
source ='src/main/java'
@@ -92,7 +92,7 @@ publishing {
9292
}
9393

9494
jacoco {
95-
toolVersion = "0.8.4"
95+
toolVersion = "0.8.6"
9696
}
9797

9898
jacocoTestReport {

gradle/wrapper/gradle-wrapper.jar

4.76 KB
Binary file not shown.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Jan 23 16:43:21 MST 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

gradlew

Lines changed: 33 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 24 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)