<p>It doesn't really come through in this pull request, but the best way to understand how much simpler this change is, is to run the following command to compare <code>build.gradle</code> now (in this pull request) to how <code>build.gradle</code> looked before the changes in commit <a class="commit-link" href="https://github.com/bisq-network/bisq-desktop/commit/175e11d81cfd353307af62d5c931cc25a7cc763f"><tt>175e11d</tt></a>. You can see that by running the following command (with this pull request branch checked out):</p>
<pre><code>$ git diff 175e11d81cfd353307af62d5c931cc25a7cc763f^ build.gradle
</code></pre>
<p>And here's that diff, just to make it easy:</p>
<div class="highlight highlight-source-diff"><pre>$ git diff 175e11d81cfd353307af62d5c931cc25a7cc763f^ build.gradle
<span class="pl-c1">diff --git build.gradle build.gradle</span>
index e1ce3fc19..1505817c5 100644
<span class="pl-md">--- build.gradle</span>
<span class="pl-mi1">+++ build.gradle</span>
<span class="pl-mdr">@@ -67,7 +67,15 @@</span> dependencies {
build.dependsOn installDist
installDist.destinationDir = file('build/app')
<span class="pl-md"><span class="pl-md">-</span>// generated with `./gradlew -q calculateChecksums | grep -v network.bisq:bisq-`</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>// To update the `dependencyVerification` block below:</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>//</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>// 1. Remove the block entirely</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>// 2. Replace the block with the following command:</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>//</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>// ./gradlew -q calculateChecksums | grep -v network.bisq:bisq- >> build.gradle</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>//</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>// 3. Run `git diff` to verify that expected hashes have changed</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>// 4. Commit the changes</span>
dependencyVerification {
verify = [
'org.controlsfx:controlsfx:b98f1c9507c05600f80323674b33d15674926c71b0116f70085b62bdacf1e573',
<span class="pl-mdr">@@ -96,7 +104,7 @@</span> dependencyVerification {
'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd',
'com.google.guava:guava:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8',
'com.google.inject:guice:9b9df27a5b8c7864112b4137fd92b36c3f1395bfe57be42fedf2f520ead1a93e',
<span class="pl-md"><span class="pl-md">-</span> 'network.bisq.libdohj:libdohj-core:797a65f00e5ddde1b119748a00c6d75bd6e0c60b65b9cfcdb2cff94bfb5c9abc',</span>
<span class="pl-mi1"><span class="pl-mi1">+</span> 'network.bisq.libdohj:libdohj-core:cef7db8a2032ffbc229ccacc29b7d13e8ee1daf1cd60ee8f988cdfa60a041d8e',</span>
'com.github.JesusMcCloud.netlayer:tor:3896950c56a41985f901ff9475524ac162cba18b2d5a0ed39810b20ddaf5128a',
'org.jetbrains.kotlin:kotlin-stdlib-jdk8:841b021d62fc007ce2883963ff9440d5393fb1f6a0604ed68cd016afcaf02967',
'com.github.MicroUtils:kotlin-logging:7dbd501cc210d721f730d480c53ee2a6e3c154ae89b07dc7dee224b9c5aca9eb',
<span class="pl-mdr">@@ -118,7 +126,7 @@</span> dependencyVerification {
'commons-logging:commons-logging:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
'aopalliance:aopalliance:0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08',
<span class="pl-md"><span class="pl-md">-</span> 'com.github.bisq-network.bitcoinj:bitcoinj-core:ad39183983285d00082cb01638428913db976fa8fd7494c7e223fc81c74d578a',</span>
<span class="pl-mi1"><span class="pl-mi1">+</span> 'com.github.bisq-network.bitcoinj:bitcoinj-core:05c94cc68f1524ed08f5aa815f5f09d99a3aae5ab277527d7729ee74d0aece13',</span>
'com.lambdaworks:scrypt:9a82d218099fb14c10c0e86e7eefeebd8c104de920acdc47b8b4b7a686fb73b4',
'com.google.zxing:core:11aae8fd974ab25faa8208be50468eb12349cd239e93e7c797377fa13e381729',
'com.cedricwalter:tor-binary-geoip:7fc7b5ebf80d65ec53d97dd8d3878b8d2c85dc04f3943e5e85e7ba641655492b',</pre></div>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq-desktop/pull/1563#issuecomment-394741695">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtnOkfvoGlMWcAmAizvN9DMGLqeugks5t5pxxgaJpZM4Ua_LQ">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtiMDB1W5J6WPoOjNRd124F1cUDagks5t5pxxgaJpZM4Ua_LQ.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","potentialAction":{"@type":"ViewAction","target":"https://github.com/bisq-network/bisq-desktop/pull/1563#issuecomment-394741695","url":"https://github.com/bisq-network/bisq-desktop/pull/1563#issuecomment-394741695","name":"View Pull Request"},"description":"View this Pull Request on GitHub","publisher":{"@type":"Organization","name":"GitHub","url":"https://github.com"}}</script>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq-desktop","title":"bisq-network/bisq-desktop","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq-desktop"}},"updates":{"snippets":[{"icon":"PERSON","message":"@cbeams in #1563: It doesn't really come through in this pull request, but the best way to understand how much simpler this change is, is to run the following command to compare `build.gradle` now (in this pull request) to how `build.gradle` looked before the changes in commit 175e11d81cfd353307af62d5c931cc25a7cc763f. You can see that by running the following command (with this pull request branch checked out):\r\n\r\n\t$ git diff 175e11d81cfd353307af62d5c931cc25a7cc763f^ build.gradle\r\n\r\nAnd here's that diff, just to make it easy:\r\n\r\n```diff\r\n$ git diff 175e11d81cfd353307af62d5c931cc25a7cc763f^ build.gradle\r\ndiff --git build.gradle build.gradle\r\nindex e1ce3fc19..1505817c5 100644\r\n--- build.gradle\r\n+++ build.gradle\r\n@@ -67,7 +67,15 @@ dependencies {\r\n build.dependsOn installDist\r\n installDist.destinationDir = file('build/app')\r\n\r\n-// generated with `./gradlew -q calculateChecksums | grep -v network.bisq:bisq-`\r\n+// To update the `dependencyVerification` block below:\r\n+//\r\n+// 1. Remove the block entirely\r\n+// 2. Replace the block with the following command:\r\n+//\r\n+// ./gradlew -q calculateChecksums | grep -v network.bisq:bisq- \u003e\u003e build.gradle\r\n+//\r\n+// 3. Run `git diff` to verify that expected hashes have changed\r\n+// 4. Commit the changes\r\n dependencyVerification {\r\n verify = [\r\n 'org.controlsfx:controlsfx:b98f1c9507c05600f80323674b33d15674926c71b0116f70085b62bdacf1e573',\r\n@@ -96,7 +104,7 @@ dependencyVerification {\r\n 'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd',\r\n 'com.google.guava:guava:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8',\r\n 'com.google.inject:guice:9b9df27a5b8c7864112b4137fd92b36c3f1395bfe57be42fedf2f520ead1a93e',\r\n- 'network.bisq.libdohj:libdohj-core:797a65f00e5ddde1b119748a00c6d75bd6e0c60b65b9cfcdb2cff94bfb5c9abc',\r\n+ 'network.bisq.libdohj:libdohj-core:cef7db8a2032ffbc229ccacc29b7d13e8ee1daf1cd60ee8f988cdfa60a041d8e',\r\n 'com.github.JesusMcCloud.netlayer:tor:3896950c56a41985f901ff9475524ac162cba18b2d5a0ed39810b20ddaf5128a',\r\n 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:841b021d62fc007ce2883963ff9440d5393fb1f6a0604ed68cd016afcaf02967',\r\n 'com.github.MicroUtils:kotlin-logging:7dbd501cc210d721f730d480c53ee2a6e3c154ae89b07dc7dee224b9c5aca9eb',\r\n@@ -118,7 +126,7 @@ dependencyVerification {\r\n 'commons-logging:commons-logging:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',\r\n 'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',\r\n 'aopalliance:aopalliance:0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08',\r\n- 'com.github.bisq-network.bitcoinj:bitcoinj-core:ad39183983285d00082cb01638428913db976fa8fd7494c7e223fc81c74d578a',\r\n+ 'com.github.bisq-network.bitcoinj:bitcoinj-core:05c94cc68f1524ed08f5aa815f5f09d99a3aae5ab277527d7729ee74d0aece13',\r\n 'com.lambdaworks:scrypt:9a82d218099fb14c10c0e86e7eefeebd8c104de920acdc47b8b4b7a686fb73b4',\r\n 'com.google.zxing:core:11aae8fd974ab25faa8208be50468eb12349cd239e93e7c797377fa13e381729',\r\n 'com.cedricwalter:tor-binary-geoip:7fc7b5ebf80d65ec53d97dd8d3878b8d2c85dc04f3943e5e85e7ba641655492b',\r\n```"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq-desktop/pull/1563#issuecomment-394741695"}}}</script>
<script type="application/ld+json">{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "37567f93-e2a7-4e2a-ad37-a9160fc62647",
"title": "Re: [bisq-network/bisq-desktop] Rework recent changes to dependency verification (#1563)",
"sections": [
{
"text": "",
"activityTitle": "**Chris Beams**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@cbeams",
"facts": [
]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"bisq-network/bisq-desktop\",\n\"issueId\": 1563,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"bisq-network/bisq-desktop\",\n\"pullRequestId\": 1563\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq-desktop/pull/1563#issuecomment-394741695"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 342618832\n}"
}
],
"themeColor": "26292E"
}</script>