Skip to content

Commit

Permalink
desktop: Move build configuration to its own build.gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
alvasw committed Aug 4, 2023
1 parent 3d94833 commit 41eafd2
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 75 deletions.
75 changes: 0 additions & 75 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,81 +98,6 @@ configure([project(':cli'),
}
}

configure(project(':desktop')) {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'org.openjfx.javafxplugin'
apply from: 'package/package.gradle'

shadowDistTar.enabled = false
shadowDistZip.enabled = false

javafx {
version = "$javafxVersion"
modules = ['javafx.controls', 'javafx.fxml']
}

version = file("src/main/resources/version.txt").text.trim()

jar.manifest.attributes(
"Implementation-Title": project.name,
"Implementation-Version": version)

mainClassName = 'bisq.desktop.app.BisqAppMain'

jar {
preserveFileTimestamps = false
reproducibleFileOrder = true
}

sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files

dependencies {
implementation enforcedPlatform(project(':platform'))
implementation project(':assets')
implementation project(':common')
implementation project(':proto')
implementation project(':p2p')
implementation project(':core')
annotationProcessor libs.lombok
compileOnly libs.lombok
implementation libs.logback.classic
implementation libs.logback.core
implementation libs.google.gson
implementation libs.google.guava
implementation libs.jcsv
implementation libs.jfoenix
implementation libs.commons.io
implementation libs.fontawesomefx
implementation libs.fontawesomefx.commons
implementation libs.fontawesomefx.materialdesign.font
implementation libs.qrgen
implementation libs.apache.commons.lang3
implementation libs.bouncycastle.bcpg.jdk15on
implementation libs.fxmisc.easybind
implementation libs.jetbrains.annotations
implementation libs.slf4j.api
implementation(libs.bitcoinj) {
exclude(module: 'bcprov-jdk15on')
exclude(module: 'guava')
exclude(module: 'jsr305')
exclude(module: 'okhttp')
exclude(module: 'okio')
exclude(module: 'slf4j-api')
}
implementation(libs.google.guice) {
exclude(module: 'guava')
}
testAnnotationProcessor libs.lombok
testCompileOnly libs.lombok
testImplementation libs.natpryce.make.it.easy
}

test {
systemProperty 'jdk.attach.allowAttachSelf', true
}
}


configure(project(':seednode')) {
apply plugin: 'com.github.johnrengelman.shadow'

Expand Down
72 changes: 72 additions & 0 deletions desktop/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,75 @@
plugins {
id 'bisq.java-conventions'
}

apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'org.openjfx.javafxplugin'
apply from: 'package/package.gradle'

shadowDistTar.enabled = false
shadowDistZip.enabled = false

javafx {
version = "16"
modules = ['javafx.controls', 'javafx.fxml']
}

version = file("src/main/resources/version.txt").text.trim()

jar.manifest.attributes(
"Implementation-Title": project.name,
"Implementation-Version": version)

mainClassName = 'bisq.desktop.app.BisqAppMain'

jar {
preserveFileTimestamps = false
reproducibleFileOrder = true
}

sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files

dependencies {
implementation enforcedPlatform(project(':platform'))
implementation project(':assets')
implementation project(':common')
implementation project(':proto')
implementation project(':p2p')
implementation project(':core')
annotationProcessor libs.lombok
compileOnly libs.lombok
implementation libs.logback.classic
implementation libs.logback.core
implementation libs.google.gson
implementation libs.google.guava
implementation libs.jcsv
implementation libs.jfoenix
implementation libs.commons.io
implementation libs.fontawesomefx
implementation libs.fontawesomefx.commons
implementation libs.fontawesomefx.materialdesign.font
implementation libs.qrgen
implementation libs.apache.commons.lang3
implementation libs.bouncycastle.bcpg.jdk15on
implementation libs.fxmisc.easybind
implementation libs.jetbrains.annotations
implementation libs.slf4j.api
implementation(libs.bitcoinj) {
exclude(module: 'bcprov-jdk15on')
exclude(module: 'guava')
exclude(module: 'jsr305')
exclude(module: 'okhttp')
exclude(module: 'okio')
exclude(module: 'slf4j-api')
}
implementation(libs.google.guice) {
exclude(module: 'guava')
}
testAnnotationProcessor libs.lombok
testCompileOnly libs.lombok
testImplementation libs.natpryce.make.it.easy
}

test {
systemProperty 'jdk.attach.allowAttachSelf', true
}

0 comments on commit 41eafd2

Please sign in to comment.