From 9167ed41b58cd2429f311ac98df5290013e8e570 Mon Sep 17 00:00:00 2001 From: Danil-Didkovskiy Date: Fri, 1 Aug 2025 13:05:55 +0300 Subject: [PATCH 1/2] Use Java 17 for publishing since Gradle 9 requires it --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8ebd4bc..7c135d9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,8 +15,8 @@ jobs: - 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 From 9bd1e70853d274ef01ac69ccefd1e3a5c7aa78a8 Mon Sep 17 00:00:00 2001 From: Danil-Didkovskiy Date: Fri, 1 Aug 2025 13:24:21 +0300 Subject: [PATCH 2/2] Test the entire set of artifacts when using the latest version of JxBrowser. --- .../gradle/JxBrowserPluginFunctionalTest.kt | 54 ++----------------- .../jxbrowser/gradle/JxBrowserPluginTest.kt | 3 ++ 2 files changed, 6 insertions(+), 51 deletions(-) diff --git a/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginFunctionalTest.kt b/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginFunctionalTest.kt index 8ce53ca..1019c81 100644 --- a/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginFunctionalTest.kt +++ b/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginFunctionalTest.kt @@ -96,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( """ @@ -123,57 +126,6 @@ internal class JxBrowserPluginFunctionalTest { "toCopy"(jxbrowser.win64) "toCopy"(jxbrowser.linux64) "toCopy"(jxbrowser.linuxArm) - } - - tasks.register("$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) diff --git a/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginTest.kt b/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginTest.kt index f2304ba..5f845d7 100644 --- a/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginTest.kt +++ b/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginTest.kt @@ -65,6 +65,9 @@ internal class JxBrowserPluginTest { win64.get() shouldBe "$group:jxbrowser-win64:$jxBrowserVersion" javafx.get() shouldBe "$group:jxbrowser-javafx:$jxBrowserVersion" macArm.get() shouldBe "$group:jxbrowser-mac-arm:$jxBrowserVersion" + kotlin.get() shouldBe "$group:jxbrowser-kotlin:$jxBrowserVersion" + winArm.get() shouldBe "$group:jxbrowser-win64-arm:$jxBrowserVersion" + compose.get() shouldBe "$group:jxbrowser-compose:$jxBrowserVersion" linux64.get() shouldBe "$group:jxbrowser-linux64:$jxBrowserVersion" linuxArm.get() shouldBe "$group:jxbrowser-linux64-arm:$jxBrowserVersion" crossPlatform.get() shouldBe "$group:jxbrowser-cross-platform:$jxBrowserVersion"