diff --git a/README.md b/README.md index 432356b..8be61f6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This example demonstrates how to configure a Gradle project with JxBrowser to em ## Prerequisites -* Java 17 or newer. +* Java 8. * Your JxBrowser license key, or a [free 30-day evaluation key][web-form]. ## Run the JavaFX application diff --git a/build.gradle.kts b/build.gradle.kts index ae67000..7c11726 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -22,10 +22,9 @@ plugins { java application kotlin("jvm") version "2.0.0" - id("org.openjfx.javafxplugin") version "0.1.0" // Provides convenience methods for adding JxBrowser dependencies into a project. - id("com.teamdev.jxbrowser") version "1.2.1" + id("com.teamdev.jxbrowser") version "2.0.0" } repositories { @@ -33,7 +32,7 @@ repositories { } jxbrowser { - version = "8.2.1" + version = "7.44.2" } dependencies { @@ -42,13 +41,6 @@ dependencies { // Adds dependency to the JavaFX UI toolkit integration. implementation(jxbrowser.javafx) - - // Adds dependency to the JxBrowser Kotlin DSL. - implementation(jxbrowser.kotlin) -} - -javafx { - modules("javafx.controls") } application { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..033e24c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84a0b92..e18bc25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 1b6c787..fcb6fca --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +130,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +213,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle.kts b/settings.gradle.kts index c564f93..f4181f3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2024, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following diff --git a/src/main/java/com/teamdev/jxbrowser/quickstart/gradle/javafx/App.java b/src/main/java/com/teamdev/jxbrowser/quickstart/gradle/javafx/App.java index 1e04caf..b80749b 100644 --- a/src/main/java/com/teamdev/jxbrowser/quickstart/gradle/javafx/App.java +++ b/src/main/java/com/teamdev/jxbrowser/quickstart/gradle/javafx/App.java @@ -1,5 +1,5 @@ /* - * Copyright 2024, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -22,6 +22,7 @@ import static com.teamdev.jxbrowser.engine.RenderingMode.HARDWARE_ACCELERATED; +import com.teamdev.jxbrowser.browser.Browser; import com.teamdev.jxbrowser.engine.Engine; import com.teamdev.jxbrowser.view.javafx.BrowserView; import javafx.application.Application; @@ -39,17 +40,17 @@ public final class App extends Application { @Override public void start(Stage primaryStage) { // Initialize Chromium. - var engine = Engine.newInstance(HARDWARE_ACCELERATED); + Engine engine = Engine.newInstance(HARDWARE_ACCELERATED); - var browser = engine.newBrowser(); + Browser browser = engine.newBrowser(); // Load the required web page. browser.navigation().loadUrl("https://html5test.teamdev.com"); // Create and embed JavaFX BrowserView component to display web content. - var view = BrowserView.newInstance(browser); + BrowserView view = BrowserView.newInstance(browser); - var scene = new Scene(new BorderPane(view), 1280, 800); + Scene scene = new Scene(new BorderPane(view), 1280, 800); primaryStage.setTitle("JxBrowser JavaFX"); primaryStage.setScene(scene); primaryStage.show(); diff --git a/src/main/kotlin/com/teamdev/jxbrowser/quickstart/gradle/javafx/KotlinApp.kt b/src/main/kotlin/com/teamdev/jxbrowser/quickstart/gradle/javafx/KotlinApp.kt index a62f765..317feb5 100644 --- a/src/main/kotlin/com/teamdev/jxbrowser/quickstart/gradle/javafx/KotlinApp.kt +++ b/src/main/kotlin/com/teamdev/jxbrowser/quickstart/gradle/javafx/KotlinApp.kt @@ -1,5 +1,5 @@ /* - * Copyright 2024, TeamDev. All rights reserved. + * Copyright 2025, TeamDev. All rights reserved. * * Redistribution and use in source and/or binary forms, with or without * modification, must retain the above copyright notice and the following @@ -20,7 +20,7 @@ package com.teamdev.jxbrowser.quickstart.gradle.javafx -import com.teamdev.jxbrowser.dsl.Engine +import com.teamdev.jxbrowser.engine.Engine import com.teamdev.jxbrowser.engine.RenderingMode.HARDWARE_ACCELERATED import com.teamdev.jxbrowser.view.javafx.BrowserView import javafx.application.Application @@ -36,7 +36,7 @@ import javafx.stage.Stage class KotlinApp : Application() { override fun start(primaryStage: Stage) { // Initialize Chromium. - val engine = Engine(HARDWARE_ACCELERATED) + val engine = Engine.newInstance(HARDWARE_ACCELERATED) // Create a Browser instance. val browser = engine.newBrowser()