Update to Gradle 6.5 (#783)

* Update Gradle to 6.5 version. Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com> * Enable Gradle dependency verification. Enabled both checksum and signature verifications. Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com> * Enable some gradle options to speed-up local builds. Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
pinterest · Jun 17, 2020 · 77348f8 · 77348f8
1 parent 9f278eb
commit 77348f8
Show file tree

Hide file tree

Showing 12 changed files with 268 additions and 8 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -22,3 +22,6 @@ indent_size = 4
 
 [*.md]
 trim_trailing_whitespace = false
+
+[gradle/verification-metadata.xml]
+indent_size = 3
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 * text=auto
 *.bat eol=crlf
+*.gpg binary
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Experimental SpacingAroundAngleBracketsRule ([#769](https://github.com/pinterest/ktlint/pull/769))
 - Checksum generation for executable Jar ([#695](https://github.com/pinterest/ktlint/issues/695))
+- Enable Gradle dependency verification
+
+### Changed
+- Update Gradle to 6.5 version
 
 
 ## [0.37.2] - 2020-06-16

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -57,7 +57,12 @@ without having to change the core ruleset.
 
 New core rules will be added first to the experimental ruleset before being rolled out widely.
 
+## Updating dependencies
+
+Project has enabled [Gradle dependencies verification](https://docs.gradle.org/6.2/userguide/dependency_verification.html).
+On adding/updating any dependency, ensure that you've added dependency provided checksum/signature to `gradle/verification-metadata.xml` file.
+
 ## License
 
 By contributing to this project, you agree that your contributions will be
-licensed under its [license](LICENSE).
+licensed under its [license](LICENSE).
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 ext.versions = [
   'kotlin': '1.3.70',
-  'gradle': '5.6.2'
+  'gradle': '6.5'
 ]
 
 ext.deps = [
@@ -40,7 +40,7 @@ task ktlint(type: JavaExec, group: LifecycleBasePlugin.VERIFICATION_GROUP) {
 
 allprojects {
   repositories {
-    gradlePluginPortal()
+    mavenCentral()
   }
 
   tasks.withType(JavaCompile) {

diff --git a/gradle.properties b/gradle.properties
@@ -13,3 +13,7 @@ POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=pinterest
 POM_DEVELOPER_NAME=Pinterest, Inc.
+
+# Gradle properties
+org.gradle.parallel=true
+org.gradle.caching=true
diff --git a/gradle/verification-keyring.gpg b/gradle/verification-keyring.gpg
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.0.xsd">
+   <configuration>
+      <verify-metadata>true</verify-metadata>
+      <verify-signatures>true</verify-signatures>
+      <trusted-keys>
+         <trusted-key id="160a7a9cf46221a56b06ad64461a804f2609fd89" group="com.github.shyiko.klob" name="klob" version="0.2.1"/>
+         <trusted-key id="184454fad8697760f3e00d2e4a51a45b944ffd51" group="org.apache.tika"/>
+         <trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch" name="gradle-download-task" version="4.0.2"/>
+         <trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193" group="org.jetbrains" name="annotations" version="13.0"/>
+         <trusted-key id="2e92113263fc31c74ccbaab20e91c2de43b72bb1" group="org.ec4j.core"/>
+         <trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8" group="com.thoughtworks.qdox" name="qdox" version="1.12.1"/>
+         <trusted-key id="35774b17c9836878845270f4119df80e6bf8dbc3" group="org.zeroturnaround" name="zt-exec" version="1.10"/>
+         <trusted-key id="3909c28792327fad38100eaf04633a577c200941" group="org.vafer" name="jdependency" version="2.1.1"/>
+         <trusted-key id="475f3b8e59e6e63aa78067482c7b12f2a511e325" group="org.slf4j"/>
+         <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
+         <trusted-key id="4f5277bf72a045dad4ae36dd9440c8d6decafa12" group="org.testng" name="testng" version="6.13.1"/>
+         <trusted-key id="53c935821aa6a755bd337db53595395eb3d8e1ba" group="org.apache.logging.log4j"/>
+         <trusted-key id="5897253bea3046aeea95a067e93671c7272b7b3f" group="org.jdom" name="jdom2" version="2.0.6"/>
+         <trusted-key id="58e79b6abc762159dc0b1591164bd2247b936711">
+            <trusting group="^org[.]junit($|([.].*))" regex="true"/>
+            <trusting group="org.apiguardian"/>
+            <trusting group="org.opentest4j"/>
+         </trusted-key>
+         <trusted-key id="67497e9d680ce8e95bd6b8f85ad66315fc018797" group="com.beust" name="jcommander" version="1.72"/>
+         <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="^com[.]google($|([.].*))" regex="true"/>
+         <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
+         <trusted-key id="7faa0f2206de228f0db01ad741321490758aad6f" group="org.codehaus.groovy"/>
+         <trusted-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61">
+            <trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
+            <trusting group="info.picocli"/>
+         </trusted-key>
+         <trusted-key id="906e5e684729c006267ddd4b105de36038d8c6c5" group="org.codehaus.plexus" name="plexus-utils" version="3.0.24"/>
+         <trusted-key id="9e84765a7aa3e3d3d5598a408e3f0de7ae354651" group="^com[.]squareup($|([.].*))" regex="true"/>
+         <trusted-key id="a778fde933a96dda827840d8e2b3d84202b812d9" group="org.assertj"/>
+         <trusted-key id="afcc4c7594d09e2182c60e0f7a01b0f236e5430f" group="com.google.code.gson"/>
+         <trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0">
+            <trusting group="commons-cli"/>
+            <trusting group="commons-io"/>
+         </trusted-key>
+         <trusted-key id="ce8075a251547bee249bc151a2115ae15f6b8b72" group="^org[.]apache($|([.].*))" regex="true"/>
+         <trusted-key id="d196a5e3e70732eeb2e5007f1861c322c56014b2" group="commons-io"/>
+         <trusted-key id="d4c89ea4aaf455fd88b22087efe8086f9e93774e" group="junit" name="junit" version="4.12"/>
+         <trusted-key id="ea23db1360d9029481e7f2efecdfea3cb4493b94" group="jline" name="jline" version="2.14.6"/>
+         <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51">
+            <trusting group="^org[.]junit($|([.].*))" regex="true"/>
+            <trusting group="org.opentest4j"/>
+         </trusted-key>
+      </trusted-keys>
+   </configuration>
+   <components>
+      <component group="com.github.breadmoirai" name="github-release" version="2.2.12">
+         <artifact name="github-release-2.2.12.jar">
+            <sha256 value="4432bfd7b1a606760aa9d584fc3aa0254bd1b61f51dd5eff038c64d2f9b89782" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="github-release-2.2.12.pom">
+            <sha256 value="0cce474144f67d4ad0a25cbc2e5e5adcd78645ecb2d6685325b231e4e38530b8" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.breadmoirai.github-release" name="com.github.breadmoirai.github-release.gradle.plugin" version="2.2.12">
+         <artifact name="com.github.breadmoirai.github-release.gradle.plugin-2.2.12.pom">
+            <sha256 value="4f5fb4a87bbcbc1967a7bdf0b76180e95f2565716a208adf92cf01fb6f758a80" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.jengelman.gradle.plugins" name="shadow" version="5.0.0">
+         <artifact name="shadow-5.0.0.jar">
+            <sha256 value="73e8d677735e7fd5a63b9ab0c5d60b72fe784b118a9e546a20aee4712312e548" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="shadow-5.0.0.pom">
+            <sha256 value="c20c2d72d6b437bbf2cb4663e31f0e3afd8dbb73c4cbd469aa356a15f85d181f" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.github.johnrengelman.shadow" name="com.github.johnrengelman.shadow.gradle.plugin" version="5.0.0">
+         <artifact name="com.github.johnrengelman.shadow.gradle.plugin-5.0.0.pom">
+            <sha256 value="bda9d3b8b6b9e6289b225a4ac420584f5c9257b3293ce9b46816f22b399c8147" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="com.vanniktech.maven.publish" name="com.vanniktech.maven.publish.gradle.plugin" version="0.8.0">
+         <artifact name="com.vanniktech.maven.publish.gradle.plugin-0.8.0.pom">
+            <sha256 value="d43d0cb55f37ee5f09edabdc8653bfc6ca31d568676e86e6a0892403ac9f210d" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="commons-io" name="commons-io" version="2.5">
+         <artifact name="commons-io-2.5.pom">
+            <pgp value="6bdaca2c0493cca133b372d09c4f7e9d98b1cc53"/>
+         </artifact>
+      </component>
+      <component group="gradle.plugin.com.vanniktech" name="gradle-maven-publish-plugin" version="0.8.0">
+         <artifact name="gradle-maven-publish-plugin-0.8.0.jar">
+            <sha256 value="9a61ceef14d2a2203d7727649d44f0a596bd5bad15c0bb31542a21e9fe5cc416" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="gradle-maven-publish-plugin-0.8.0.pom">
+            <sha256 value="724fdc70f22a250a9647ad83941b0c36a4affb9d3a68aaf45b9a30449bfff28f" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="gradle.plugin.org.gradle.crypto" name="checksum" version="1.1.0">
+         <artifact name="checksum-1.1.0.jar">
+            <sha256 value="b18a3b5ad146a21c130f8451fbe32d50dd965f0fcb2007af6ed0672f5346c5b2" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="checksum-1.1.0.pom">
+            <sha256 value="33de5271d0259c2182a4e8f705224013e732bcae803df060e77daa3ee4883a3c" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="16">
+         <artifact name="apache-16.pom">
+            <pgp value="0cde80149711eb46dff17ae421a24b3f8b0f594a"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="17">
+         <artifact name="apache-17.pom">
+            <pgp value="ae9e53fc28ff2ab1012273d0bf1518e0160788a2"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="18">
+         <artifact name="apache-18.pom">
+            <pgp value="190d5a957ff22273e601f7a7c92c5fec70161c62"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="4">
+         <artifact name="apache-4.pom">
+            <pgp value="6e13156c0ee653f0b984663ab95bbd3fa43c4492"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="39">
+         <artifact name="commons-parent-39.pom">
+            <pgp value="808d78b17a5a2d7c3668e31fbffc9b54721244ad"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="7">
+         <artifact name="commons-parent-7.pom">
+            <pgp value="d196a5e3e70732eeb2e5007f1861c322c56014b2"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging" name="logging-parent" version="1">
+         <artifact name="logging-parent-1.pom">
+            <pgp value="9d0a56aaa0d60e0c0c7dccc0b4c70893b62babe8"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus" name="codehaus-parent" version="4">
+         <artifact name="codehaus-parent-4.pom">
+            <pgp value="2bcbdd0f23ea1cafcc11d4860374cf2e8dd1bdfd"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus" version="4.0">
+         <artifact name="plexus-4.0.pom">
+            <pgp value="c345986f0fd384669c5919e6a5f094fd3961df05"/>
+         </artifact>
+      </component>
+      <component group="org.gradle.crypto.checksum" name="org.gradle.crypto.checksum.gradle.plugin" version="1.1.0">
+         <artifact name="org.gradle.crypto.checksum.gradle.plugin-1.1.0.pom">
+            <sha256 value="3934a3cb58f40350cbac32e403fa9b5810c7ad5160c6324abe1a90cea839beaf" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="dokka-android-gradle-plugin" version="0.9.17">
+         <artifact name="dokka-android-gradle-plugin-0.9.17.jar">
+            <sha256 value="77d7638a32bcae42c929eea307c9a3b48ae1a5abd00cd29f7abf6d51079d83a9" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="dokka-android-gradle-plugin-0.9.17.pom">
+            <sha256 value="92f058aef966deca25ddcf1b1ad028d822f94891bf61491ebc914a08a3481e86" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="dokka-gradle-plugin" version="0.9.17">
+         <artifact name="dokka-gradle-plugin-0.9.17.jar">
+            <sha256 value="e9215460b1bb674b616cb9c8f1a1b172cdd7b3f4749662d864ebd3f319f0d73d" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="dokka-gradle-plugin-0.9.17.pom">
+            <sha256 value="f41e2f85d75abe256ae3f522066ad40ff9b3dc90b0f6e455508a90ba78046871" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="dokka-fatjar" version="0.9.17">
+         <artifact name="dokka-fatjar-0.9.17.jar">
+            <sha256 value="45d8d2e662a7770b2028acc251732070ff69c433bbfec09b15da3528bb1f0e44"/>
+         </artifact>
+         <artifact name="dokka-fatjar-0.9.17.pom">
+            <sha256 value="64763e90571744c85fbea6e7ac3eb9cb178c95da008c8dd3097fe5ef1b77b463"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.3.70">
+         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.3.70.pom">
+            <sha256 value="0c3b5ebeb4ed9767a9a9494d4390abeb868e0da1418db7e340984ffb96d0bf63" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.ow2" name="ow2" version="1.5">
+         <artifact name="ow2-1.5.pom">
+            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm" version="7.0-beta">
+         <artifact name="asm-7.0-beta.jar">
+            <sha256 value="ba84438f0f08ae2c2f85423dc3628361d20197c46a194687defdf63ed1896a3a" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="asm-7.0-beta.pom">
+            <sha256 value="2d85484e0c0dd935e38edec52a33267ea1d50eb06d4c2ffb90d444c089571f86" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-analysis" version="7.0-beta">
+         <artifact name="asm-analysis-7.0-beta.jar">
+            <sha256 value="4d2b20a1fb44acb33b0ddb80be58b2ad7838c1fb520282a655a1217b3c6acf19" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="asm-analysis-7.0-beta.pom">
+            <sha256 value="7a068ba0c921fe69824731f6a1b14f86ff0828a0c5941e5c24b6b501e2f6e69f" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-commons" version="7.0-beta">
+         <artifact name="asm-commons-7.0-beta.jar">
+            <sha256 value="3d8ec2534b883541b966e6dde9004967d34f7311789028afc92e2e066867dac4" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="asm-commons-7.0-beta.pom">
+            <sha256 value="2b30b9d132f43dfba6ebced3c9661b1b5c60187dfc4d5cb7e759224fea7a279e" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-tree" version="7.0-beta">
+         <artifact name="asm-tree-7.0-beta.jar">
+            <sha256 value="a2ec5b55ceb359c324ad48b15e912e33c75889237413976d1505fe32ecde82f2" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+         <artifact name="asm-tree-7.0-beta.pom">
+            <sha256 value="56e37d6b54903ca842eef8fe6c8863bc7f405186bc43e74a21575a3f2428ba70" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.forge" name="forge-parent" version="10">
+         <artifact name="forge-parent-10.pom">
+            <pgp value="180683306a9ef844d6cc0080a7eaf75aea98b19f"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="7">
+         <artifact name="oss-parent-7.pom">
+            <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="9">
+         <artifact name="oss-parent-9.pom">
+            <pgp value="44fbdbbc1a00fe414f1c1873586654072ead6677"/>
+         </artifact>
+      </component>
+   </components>
+</verification-metadata>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

diff --git a/gradlew.bat b/gradlew.bat
@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,10 @@
+pluginManagement {
+  repositories {
+    mavenCentral()
+    gradlePluginPortal()
+  }
+}
+
 rootProject.name = 'ktlint'
 
 include ':ktlint'