Merge with v8.0.0-eap

Author: vladimir-ikryanov

.github/workflows/check.yml

@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
-          distribution: 'corretto'
-          java-version: '8'
+          java-version: 17
+          distribution: oracle
       - run: |-
           ./gradlew build

.gitignore

@@ -30,6 +30,9 @@ out/
 *.tar.gz
 *.rar
 
+# Do not ignore a JAR file used by `JarProtocol` example.
+!/examples/src/main/resources/tiny-website.jar
+
 # Do not ignore Gradle Wrapper
 !/gradle/wrapper/gradle-wrapper.jar
 

.idea/codeStyles/Project.xml

@@ -18,20 +18,20 @@
  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-}
-
 plugins {
     java
+    kotlin("jvm") version "2.0.0"
 
-    // Provides convenience methods for adding JxBrowser dependencies into a project.
+    // Adds JxBrowser.
     id("com.teamdev.jxbrowser") version "1.1.0"
+
+    // Adds UI toolkits.
+    id("org.openjfx.javafxplugin") version "0.1.0"
+    id("org.jetbrains.compose") version "1.7.0-rc01"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
 }
 
-val jxBrowserVersion by extra { "7.41.3" } // The version of JxBrowser used in the examples.
+val jxBrowserVersion by extra { "8.0.0" } // The version of JxBrowser used in the examples.
 val guavaVersion by extra { "29.0-jre" } // Some of the examples use Guava.
 
 allprojects {
@@ -41,19 +41,31 @@ allprojects {
 
 subprojects {
     apply(plugin = "java")
+    apply(plugin = "org.jetbrains.kotlin.jvm")
     apply(plugin = "com.teamdev.jxbrowser")
-
-    java.sourceCompatibility = JavaVersion.VERSION_1_8
-    java.targetCompatibility = JavaVersion.VERSION_1_8
+    apply(plugin = "org.openjfx.javafxplugin")
+    apply(plugin = "org.jetbrains.compose")
+    apply(plugin = "org.jetbrains.kotlin.plugin.compose")
 
     repositories {
         mavenCentral()
+        google()
+    }
+
+    java {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     jxbrowser {
         version = jxBrowserVersion
     }
 
+    javafx {
+        version = "17"
+        modules = listOf("javafx.controls", "javafx.swing", "javafx.fxml")
+    }
+
     dependencies {
         // Cross-platform dependency
         implementation(jxbrowser.crossPlatform)
@@ -88,16 +100,23 @@ subprojects {
         // JxBrowser for Swing dependency.
         implementation(jxbrowser.swing)
 
+        // JxBrowser for Compose dependency.
+        implementation(jxbrowser.compose)
+
+        // Dependency on Compose for the current platform.
+        implementation(compose.desktop.currentOs)
+
         // JxBrowser for SWT dependency.
         implementation(jxbrowser.swt)
 
-        // Dependency on SWT for the current platform.
+        // Dependency on an SWT for the current platform.
         implementation(Swt.toolkitDependency)
 
         // Depend on Guava for the Resources utility class used for loading resource files into strings.
         implementation("com.google.guava:guava:$guavaVersion")
 
-        implementation(files("$rootDir/examples/src/main/resources/resource.jar"))
+        // This file is used by `JarProtocol` example.
+        runtimeOnly(files(rootDir.resolve("examples/src/main/resources/tiny-website.jar")))
     }
 
     tasks.withType<JavaExec> {

.idea/inspectionProfiles/Project_Default.xml

@@ -57,7 +57,7 @@ object Swt {
      * Returns the platform bit of the SWT artifact names.
      */
     private fun osgiPlatform(): String {
-        val os = System.getProperty("os.name").toLowerCase()
+        val os = System.getProperty("os.name").lowercase()
         val arch = System.getProperty("os.arch")
         val isArm = "aarch64" == arch || "arm" == arch
         return when {

build.gradle.kts

@@ -55,7 +55,7 @@ public static void main(String[] args) {
 
         SwingUtilities.invokeLater(() -> {
             BrowserView view = BrowserView.newInstance(browser);
-            JFrame frame = new JFrame("Dispatch key event");
+            JFrame frame = new JFrame("Dispatch key events");
             frame.addWindowListener(new WindowAdapter() {
                 @Override
                 public void windowClosing(WindowEvent e) {

buildSrc/src/main/kotlin/Swt.kt

@@ -35,7 +35,7 @@
 import javax.swing.WindowConstants;
 
 /**
- * This example demonstrates how to fill HTML Form fields using JxBrowser DOM API.
+ * This example demonstrates how to fill HTML form fields using JxBrowser DOM API.
  */
 public final class DomForm {
 
@@ -63,9 +63,9 @@ public void windowClosing(WindowEvent e) {
         browser.navigation().on(FrameLoadFinished.class, event ->
                 event.frame().document().flatMap(Document::documentElement).ifPresent(element -> {
                     element.findElementByName("firstName").ifPresent(firstName ->
-                            firstName.putAttribute("value", "John"));
+                            firstName.attributes().put("value", "John"));
                     element.findElementByName("lastName").ifPresent(lastName ->
-                            lastName.putAttribute("value", "Doe"));
+                            lastName.attributes().put("value", "Doe"));
                 }));
         browser.mainFrame().ifPresent(mainFrame ->
                 mainFrame.loadHtml("<html><body><form name=\"myForm\">" +

examples/src/main/java/com/teamdev/jxbrowser/examples/DispatchKeyEvents.java

@@ -28,8 +28,8 @@
 import com.teamdev.jxbrowser.frame.Frame;
 
 /**
- * This example demonstrates how to get the list of existing attributes of a specified HTML
- * element.
+ * This example demonstrates how to obtain the list of existing attributes of
+ * a specified HTML element.
  */
 public final class DomGetAttributes {
 
@@ -44,7 +44,7 @@ public static void main(String[] args) {
                     .flatMap(Document::documentElement)
                     .flatMap(element -> element.findElementById("link"))
                     .ifPresent(
-                            linkElement -> linkElement.attributes().forEach(DomGetAttributes::print));
+                            linkElement -> linkElement.attributes().asMap().forEach(DomGetAttributes::print));
         }
     }
 

examples/src/main/java/com/teamdev/jxbrowser/examples/DomForm.java

@@ -35,7 +35,7 @@
 import javax.swing.WindowConstants;
 
 /**
- * This example demonstrates how to use querySelector DOM API.
+ * This example demonstrates how to use {@code querySelector} DOM API.
  */
 public final class DomQuerySelector {