Skip to content

Commit

Permalink
Attempt and fail to build on M1
Browse files Browse the repository at this point in the history
Includes upgrading protobuf and grpc-java to compatible versions
 - protocolbuffers/protobuf#9203
 - grpc/grpc-java#8691

Upgraded to javafx 17.0.1

Still requires having a local javafx (17.0.1) sdk for reasons I don't
fully understand. This is to avoid the "No toolkit found" error. Get
this SDK from https://gluonhq.com/products/javafx/#ea.o

At this point, ./gradlew :desktop:run brings up the GUI but blows up on
what appears to be this still unfixed error:

 - sshahine/JFoenix#1187
  • Loading branch information
cbeams committed Nov 12, 2021
1 parent 9538b53 commit 3f4fba9
Showing 1 changed file with 19 additions and 5 deletions.
24 changes: 19 additions & 5 deletions build.gradle
Expand Up @@ -42,7 +42,7 @@ configure(subprojects) {
fontawesomefxVersion = '8.0.0'
fontawesomefxCommonsVersion = '9.1.2'
fontawesomefxMaterialdesignfontVersion = '2.0.26-9.1.2'
grpcVersion = '1.25.0'
grpcVersion = '1.42.1'
gsonVersion = '2.8.5'
guavaVersion = '28.2-jre'
guiceVersion = '5.0.1'
Expand All @@ -51,7 +51,7 @@ configure(subprojects) {
httpcoreVersion = '4.4.13'
ioVersion = '2.6'
jacksonVersion = '2.12.1'
javafxVersion = '16'
javafxVersion = '17.0.1'
javaxAnnotationVersion = '1.2'
jcsvVersion = '1.4.0'
jetbrainsAnnotationsVersion = '13.0'
Expand All @@ -69,7 +69,7 @@ configure(subprojects) {
lombokVersion = '1.18.12'
mockitoVersion = '3.5.15'
netlayerVersion = '0.7.2' // Tag from https://github.com/bisq-network/netlayer/tags based on externaltor branch
protobufVersion = '3.10.0'
protobufVersion = '3.19.1'
protocVersion = protobufVersion
pushyVersion = '0.13.2'
qrgenVersion = '1.3'
Expand Down Expand Up @@ -239,12 +239,14 @@ configure(project(':common')) {

javafx {
version = "$javafxVersion"
//sdk = "/Users/cbeams/lab/javafx-sdk/javafx-sdk-17.0.1/"
modules = ['javafx.graphics']
}

dependencies {
compile project(':proto')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
compile "org.openjfx:javafx:$javafxVersion"
compile "com.google.protobuf:protobuf-java:$protobufVersion"
compile "com.google.code.gson:gson:$gsonVersion"
compile "net.sf.jopt-simple:jopt-simple:$joptVersion"
Expand Down Expand Up @@ -285,6 +287,7 @@ configure(project(':p2p')) {

javafx {
version = "$javafxVersion"
//sdk = "/Users/cbeams/lab/javafx-sdk/javafx-sdk-17.0.1/"
modules = ['javafx.base']
}

Expand Down Expand Up @@ -325,6 +328,7 @@ configure(project(':core')) {

javafx {
version = "$javafxVersion"
//sdk = "/Users/cbeams/lab/javafx-sdk/javafx-sdk-17.0.1/"
modules = ['javafx.base']
}

Expand Down Expand Up @@ -407,15 +411,24 @@ configure(project(':cli')) {
configure(project(':desktop')) {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'org.openjfx.javafxplugin'
apply plugin: 'witness'
apply from: '../gradle/witness/gradle-witness.gradle'
//apply plugin: 'witness'
//apply from: '../gradle/witness/gradle-witness.gradle'
apply from: 'package/package.gradle'

javafx {
version = "$javafxVersion"
//sdk = "/Users/cbeams/lab/javafx-sdk/javafx-sdk-17.0.1/"
modules = ['javafx.controls', 'javafx.fxml']
}

run{
jvmArgs = [
//"--module-path=/Users/cbeams/lab/javafx-sdk/javafx-sdk-17/",
"--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED", // Add this line
"--add-opens=java.base/java.lang.reflect=com.jfoenix"
]
}

version = '1.7.5-SNAPSHOT'

jar.manifest.attributes(
Expand Down Expand Up @@ -461,6 +474,7 @@ configure(project(':monitor')) {

javafx {
version = "$javafxVersion"
//sdk = "/Users/cbeams/lab/javafx-sdk/javafx-sdk-17.0.1/"
modules = ['javafx.base']
}

Expand Down

0 comments on commit 3f4fba9

Please sign in to comment.