Merge remote-tracking branch 'origin/main'

Author: vladimir-ikryanov

.github/workflows/publish.yml

@@ -10,13 +10,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: 8
+          distribution: 'zulu'
+          java-version: '17'
 
       - name: Run Gradle tasks
         run: ./gradlew check

.github/workflows/validate.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Run ktlint check
         run: ./gradlew ktlintCheck
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Run tests
         run: ./gradlew test

README.md

@@ -14,10 +14,10 @@ plugins {
 jxbrowser {
     // The JxBrowser version (required).
     // Obtain the latest release version number at https://teamdev.com/jxbrowser/.
-    version = "8.5.1"
+    version = "8.9.4"
 
     // If you're using Gradle 8.1.1 or older, use the following syntax:
-    // version.set("8.5.1")
+    // version.set("8.9.4")
 
     // The location of JxBrowser repository to use (optional).
     // It's either North America or Europe.

build.gradle.kts

@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 object BuildSettings {
     const val GROUP = "com.teamdev.jxbrowser"
     const val VERSION = "2.0.0"
-    const val JXBROWSER_VERSION = "8.5.1"
+    const val JXBROWSER_VERSION = "8.9.4"
     val javaVersion = JavaVersion.VERSION_1_8
 }
 
@@ -41,10 +41,10 @@ object PluginProperties {
 
 plugins {
     `java-gradle-plugin`
-    kotlin("jvm") version "2.1.20"
+    kotlin("jvm") version "2.2.0"
     id("maven-publish")
     id("com.gradle.plugin-publish") version "1.3.1"
-    id("org.jlleitschuh.gradle.ktlint") version "12.2.0"
+    id("org.jlleitschuh.gradle.ktlint") version "13.0.0"
 }
 
 group = BuildSettings.GROUP

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -41,7 +41,9 @@ import org.gradle.api.provider.Provider
  * It provides options for specifying the JxBrowser version, repository location,
  * and various JxBrowser dependencies based on your project's needs.
  */
-public open class JxBrowserExtension(private val project: Project) {
+public open class JxBrowserExtension(
+    private val project: Project,
+) {
     init {
         project.afterEvaluate {
             if (!version.isPresent) {
@@ -185,21 +187,21 @@ public open class JxBrowserExtension(private val project: Project) {
         return platformMap.entries.firstOrNull { it.key() }?.value
             ?: project.providers.provider {
                 val currentPlatform = "${osName()} ${jvmArch()}"
-                val errorMessage = "The current $currentPlatform platform is not supported by JxBrowser ${version.get()}"
+                val errorMessage =
+                    "The current $currentPlatform platform is not supported by JxBrowser ${version.get()}"
                 throw IllegalStateException(errorMessage)
             }
     }
 
-    private fun artifact(shortName: String): Provider<String> {
-        return version.map { versionValue ->
+    private fun artifact(shortName: String): Provider<String> =
+        version.map { versionValue ->
             checkArtifactSupported(shortName, versionValue)
             if (shortName == "core") {
                 "$GROUP:jxbrowser:$versionValue"
             } else {
                 "$GROUP:jxbrowser-$shortName:$versionValue"
             }
         }
-    }
 
     /**
      * Checks if the artifact with [shortName] exists in JxBrowser [version].

gradlew

@@ -71,7 +71,8 @@ internal class JxBrowserPluginFunctionalTest {
         )
 
         val result =
-            GradleRunner.create()
+            GradleRunner
+                .create()
                 .withProjectDir(testProjectDir)
                 .withPluginClasspath()
                 .withArguments("build")
@@ -95,6 +96,9 @@ internal class JxBrowserPluginFunctionalTest {
                 "jxbrowser-linux64-arm-$jxBrowserVersion.jar",
                 "jxbrowser-mac-$jxBrowserVersion.jar",
                 "jxbrowser-mac-arm-$jxBrowserVersion.jar",
+                "jxbrowser-kotlin-$jxBrowserVersion.jar",
+                "jxbrowser-compose-$jxBrowserVersion.jar",
+                "jxbrowser-win64-arm-$jxBrowserVersion.jar",
             )
         buildFile.writeText(
             """ 
@@ -122,56 +126,6 @@ internal class JxBrowserPluginFunctionalTest {
                 "toCopy"(jxbrowser.win64)
                 "toCopy"(jxbrowser.linux64)
                 "toCopy"(jxbrowser.linuxArm)
-            }
-            
-            tasks.register<Copy>("$taskName") {
-                from(configurations.getByName("toCopy"))
-                into("${libsFolder.toString().replace("\\", "/")}")
-            }
-            """.trimIndent(),
-        )
-
-        val result =
-            GradleRunner.create()
-                .withProjectDir(testProjectDir)
-                .withPluginClasspath()
-                .withArguments(taskName)
-                .build()
-
-        result.outcome(":$taskName") shouldBe SUCCESS
-        libsFolder.files() shouldContainExactlyInAnyOrder filesToCheck
-    }
-
-    @Test
-    fun `download JxBrowser 8 jars`() {
-        val taskName = "downloadJars"
-        val jxBrowserVersion = "8.0.0"
-        val filesToCheck =
-            listOf(
-                "jxbrowser-$jxBrowserVersion.jar",
-                "jxbrowser-kotlin-$jxBrowserVersion.jar",
-                "jxbrowser-compose-$jxBrowserVersion.jar",
-                "jxbrowser-win64-arm-$jxBrowserVersion.jar",
-            )
-
-        buildFile.writeText(
-            """ 
-            plugins {
-                base
-                id("com.teamdev.jxbrowser")
-            }
-            
-            jxbrowser {
-                version = "$jxBrowserVersion"
-                includePreviewBuilds()
-            }
-            
-            configurations {
-                create("toCopy")
-            }
-            
-            dependencies {
-                "toCopy"(jxbrowser.core)
                 "toCopy"(jxbrowser.kotlin)
                 "toCopy"(jxbrowser.compose)
                 "toCopy"(jxbrowser.winArm)
@@ -185,7 +139,8 @@ internal class JxBrowserPluginFunctionalTest {
         )
 
         val result =
-            GradleRunner.create()
+            GradleRunner
+                .create()
                 .withProjectDir(testProjectDir)
                 .withPluginClasspath()
                 .withArguments(taskName)
@@ -220,7 +175,8 @@ internal class JxBrowserPluginFunctionalTest {
 
             val failure =
                 assertFails {
-                    GradleRunner.create()
+                    GradleRunner
+                        .create()
                         .withProjectDir(testProjectDir)
                         .withPluginClasspath()
                         .withArguments("build")
@@ -247,7 +203,8 @@ internal class JxBrowserPluginFunctionalTest {
 
         val failure =
             assertFails {
-                GradleRunner.create()
+                GradleRunner
+                    .create()
                     .withProjectDir(testProjectDir)
                     .withPluginClasspath()
                     .withArguments("check")