Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update samples to use javafx 21, gradle 8.5, gradle-plugin 0.1.0, maven-plugin 0.0.8 #73

Merged
merged 11 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Gradle
.gradle/
target/

# Maven
build/

# Eclipse
bin/

# IntelliJ IDEA
.idea/
*.iml

MacOS
.DS_Store
12 changes: 6 additions & 6 deletions CommandLine/Modular/CLI/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# samples

JavaFX 13 samples to run with different options and build tools.
JavaFX samples to run with different options and build tools.

Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
Download [JDK 17 or later](http://jdk.java.net/) for your operating system.
Make sure `JAVA_HOME` is properly set to the JDK installation directory.

Download [JavaFX SDK](https://gluonhq.com/products/javafx/) for your operating
Expand All @@ -20,8 +20,8 @@ system and unzip to a desired location.
If you run on Linux or Mac, follow these steps:

cd CommandLine/Modular/CLI/hellofx
export PATH_TO_FX=path/to/javafx-sdk-13/lib
export PATH_TO_FX_MODS=path/to/javafx-jmods-13
export PATH_TO_FX=path/to/javafx-sdk/lib
abhinayagarwal marked this conversation as resolved.
Show resolved Hide resolved
export PATH_TO_FX_MODS=path/to/javafx-jmods
javac --module-path $PATH_TO_FX -d mods/hellofx $(find src -name "*.java")

To run the project:
Expand All @@ -38,8 +38,8 @@ To create and run a custom JRE:
If you run on Windows, follow these steps:

cd CommandLine\Modular\CLI\hellofx
set PATH_TO_FX="path\to\javafx-sdk-13\lib"
set PATH_TO_FX_MODS="path\to\javafx-jmods-13"
set PATH_TO_FX="path\to\javafx-sdk\lib"
abhinayagarwal marked this conversation as resolved.
Show resolved Hide resolved
set PATH_TO_FX_MODS="path\to\javafx-jmods"
dir /s /b src\*.java > sources.txt & javac --module-path %PATH_TO_FX% -d mods/hellofx @sources.txt & del sources.txt

To run the project:
Expand Down
4 changes: 2 additions & 2 deletions CommandLine/Modular/Gradle/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# samples

JavaFX 13 samples to run with different options and build tools.
JavaFX samples to run with different options and build tools.

Download [JDK 11 or later](http://jdk.java.net/) for your operating system.
Download [JDK 17 or later](http://jdk.java.net/) for your operating system.
Make sure `JAVA_HOME` is properly set to the JDK installation directory.

## Modular - Gradle
Expand Down
11 changes: 7 additions & 4 deletions CommandLine/Modular/Gradle/hellofx/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
plugins {
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.9'
id 'org.beryx.jlink' version '2.12.0'
id 'org.openjfx.javafxplugin' version '0.1.0'
id 'org.beryx.jlink' version '2.26.0'
}

repositories {
mavenCentral()
}

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

mainClassName = "$moduleName/hellofx.HelloFX"
application {
mainClass = "hellofx.HelloFX"
mainModule = "hellofx"
}


jlink {
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Tue Nov 15 11:51:46 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
Loading