From cc667c6940278134b087e41f7b56bb585aeeb87e Mon Sep 17 00:00:00 2001 From: Charney Kaye Date: Wed, 16 Aug 2023 12:23:20 -0700 Subject: [PATCH] Test Pull Request CI (#2) --- README.md | 5 +++++ build.gradle | 27 +++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index e4759d8..a4294ab 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,8 @@ # JavaCV + JavaFX + Spring Boot + jlink/jpackage + Gradle + GitHub Actions Based on a real project we're working on, this is a minimal example of how to build a JavaFX application with JavaCV, and package it as a native application using jlink/jpackage. + +## Stackoverflow + +**How to Gradle load JavaCV binaries only for current platform?** +https://stackoverflow.com/questions/76908209/how-to-gradle-load-javacv-binaries-only-for-current-platform diff --git a/build.gradle b/build.gradle index d2528e3..b7dacc9 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ repositories { } javafx { - version = "${rootProject.ext.javaFxVersion}" + version = javaFxVersion modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.graphics'] } @@ -61,8 +61,6 @@ javafx { ext.os = org.gradle.internal.os.OperatingSystem.current() as org.gradle.internal.os.OperatingSystem jlink { - // imageZip = file("$buildDir/image-zip/javacv-example.zip") - // options = ['--bind-services', '--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages'] addExtraDependencies 'javafx' launcher { @@ -70,31 +68,28 @@ jlink { noConsole = true } jpackage { - if (os.windows) { -// installerOptions = ['--win-per-user-install', '--win-dir-chooser', '--win-menu'] - } } } dependencies { - implementation "ch.qos.logback:logback-classic:${rootProject.ext.logbackVersion}" - implementation "ch.qos.logback:logback-core:${rootProject.ext.logbackVersion}" - implementation "org.openjfx:javafx-base:${rootProject.ext.javaFxVersion}" - implementation "org.openjfx:javafx-controls:${rootProject.ext.javaFxVersion}" - implementation "org.openjfx:javafx-fxml:${rootProject.ext.javaFxVersion}" - implementation "org.openjfx:javafx-graphics:${rootProject.ext.javaFxVersion}" - implementation "org.springframework.boot:spring-boot-starter-logging:${rootProject.ext.springBootVersion}" - implementation "org.springframework.boot:spring-boot-starter:${rootProject.ext.springBootVersion}" + implementation "ch.qos.logback:logback-classic:${logbackVersion}" + implementation "ch.qos.logback:logback-core:${logbackVersion}" + implementation "org.openjfx:javafx-base:${javaFxVersion}" + implementation "org.openjfx:javafx-controls:${javaFxVersion}" + implementation "org.openjfx:javafx-fxml:${javaFxVersion}" + implementation "org.openjfx:javafx-graphics:${javaFxVersion}" + implementation "org.springframework.boot:spring-boot-starter-logging:${springBootVersion}" + implementation "org.springframework.boot:spring-boot-starter:${springBootVersion}" implementation 'commons-codec:commons-codec:1.15' implementation 'commons-io:commons-io:2.11.0' implementation 'org.bytedeco:ffmpeg-platform-gpl:6.0-1.5.9' // Optional GPL builds with (almost) everything enabled implementation 'org.bytedeco:flandmark-platform:1.07-1.5.8' // Required by org.bytedeco.javacv implementation 'org.bytedeco:javacv-platform:1.5.9' implementation 'org.reflections:reflections:0.10.2' - testImplementation "org.junit.jupiter:junit-jupiter-api:${rootProject.ext.junitVersion}" + testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" testImplementation 'org.hamcrest:hamcrest-library:2.2' testImplementation 'org.mockito:mockito-junit-jupiter' - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${rootProject.ext.junitVersion}" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" } //noinspection ConfigurationAvoidance