<p>I made a few changes at an attempt to cleanup and reorganize some of the gradle config.</p>
<ul>
<li>Remove duplicate openjfx dependencies in common/build.gradle.</li>
<li>Use latest Gradle (4.10.2).</li>
<li>Move desktop/gradle files to root gradle folder. Rather than having a gradle folder underneath the desktop folder, put its content in the root gradle folder to reduce duplication and have a single location for gradle content.</li>
<li>Define some of the common buildscript dependencies in the root build.gradle so as<br>
to reduce duplication and easier maintenance (i.e. updating version numbers). Gradle build files within sub folders should be able to apply these plugins without also having to define them as a dependency first. <strong>I am not sure if this is a desired change. Feedback appreciated!</strong></li>
</ul>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/bisq-network/bisq/pull/1808'>https://github.com/bisq-network/bisq/pull/1808</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Remove duplicate dependencies</li>
  <li>Move desktop/gradle files to root gradle folder</li>
  <li>Use gradle-4.10.2</li>
  <li>Move common buildscript dependencies to root build.gradle</li>
  <li>Remove unnecessary compileJava and Run blocks</li>
  <li>Merge remote-tracking branch 'upstream/master' into cleanup-gradle-config</li>
  <li>Add missing javafx dependencies</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-0">build.gradle</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-1">common/build.gradle</a>
    (20)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-2">desktop/build.gradle</a>
    (11)
  </li>
  <li>
    <strong>D</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-3">desktop/gradle/wrapper/gradle-wrapper.jar</a>
    (0)
  </li>
  <li>
    <strong>D</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-4">desktop/gradle/wrapper/gradle-wrapper.properties</a>
    (6)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-5">gradle/witness/README.md</a>
    (0)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-6">gradle/witness/gradle-witness.jar</a>
    (0)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-7">gradle/wrapper/gradle-wrapper.properties</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/1808/files#diff-8">seednode/build.gradle</a>
    (9)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq/pull/1808.patch'>https://github.com/bisq-network/bisq/pull/1808.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq/pull/1808.diff'>https://github.com/bisq-network/bisq/pull/1808.diff</a></li>
</ul>

<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/pull/1808">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtmQAo72-OYwUULlm7Kn5BAKu-C0wks5un6QGgaJpZM4X21ub">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtsCCIZAdqQgBk5x4ag5inOkBQztCks5un6QGgaJpZM4X21ub.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq","title":"bisq-network/bisq","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"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Cleanup gradle config (#1808)"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/1808"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/1808",
"url": "https://github.com/bisq-network/bisq/pull/1808",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "Cleanup gradle config (#1808)",
"sections": [
{
"text": "",
"activityTitle": "**Devin Bileck**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@devinbileck",
"facts": [

]
},
{
"title": "Commit Summary",
"facts": [
{
"name": "dfa259c",
"value": "Remove duplicate dependencies"
},
{
"name": "dd3f391",
"value": "Move desktop/gradle files to root gradle folder"
},
{
"name": "6eacd67",
"value": "Use gradle-4.10.2"
},
{
"name": "6e931b5",
"value": "Move common buildscript dependencies to root build.gradle"
},
{
"name": "a798311",
"value": "Remove unnecessary compileJava and Run blocks"
},
{
"name": "db23c30",
"value": "Merge remote-tracking branch 'upstream/master' into cleanup-gradle-config"
},
{
"name": "7164567",
"value": "Add missing javafx dependencies"
}
]
},
{
"title": "File Changes",
"facts": [
{
"name": "Modified",
"value": "[build.gradle](https://github.com/bisq-network/bisq/pull/1808/files#diff-0) (11 changes)"
},
{
"name": "Modified",
"value": "[common/build.gradle](https://github.com/bisq-network/bisq/pull/1808/files#diff-1) (20 changes)"
},
{
"name": "Modified",
"value": "[desktop/build.gradle](https://github.com/bisq-network/bisq/pull/1808/files#diff-2) (11 changes)"
},
{
"name": "Removed",
"value": "[desktop/gradle/wrapper/gradle-wrapper.jar](https://github.com/bisq-network/bisq/pull/1808/files#diff-3) (0 changes)"
},
{
"name": "Removed",
"value": "[desktop/gradle/wrapper/gradle-wrapper.properties](https://github.com/bisq-network/bisq/pull/1808/files#diff-4) (6 changes)"
},
{
"name": "Renamed",
"value": "[gradle/witness/README.md](https://github.com/bisq-network/bisq/pull/1808/files#diff-5) (0 changes)"
},
{
"name": "Renamed",
"value": "[gradle/witness/gradle-witness.jar](https://github.com/bisq-network/bisq/pull/1808/files#diff-6) (0 changes)"
},
{
"name": "Modified",
"value": "[gradle/wrapper/gradle-wrapper.properties](https://github.com/bisq-network/bisq/pull/1808/files#diff-7) (2 changes)"
},
{
"name": "Modified",
"value": "[seednode/build.gradle](https://github.com/bisq-network/bisq/pull/1808/files#diff-8) (9 changes)"
}
]
}
],
"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\",\n\"issueId\": 1808,\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\",\n\"pullRequestId\": 1808\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq/pull/1808"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq/pull/1808.patch"
}
],
"@type": "OpenUri",
"name": "View patch"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq/pull/1808.diff"
}
],
"@type": "OpenUri",
"name": "View diff"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 400251803\n}"
}
],
"themeColor": "26292E"
}
]</script>