From e438a0e6b15c33068bc7c2f53cde0c069a2da165 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:51:16 +0000 Subject: [PATCH 1/2] Update plugin org.jlleitschuh.gradle.ktlint to v13 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7457e26..ff75f9f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,7 +44,7 @@ plugins { 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.3.0" + id("org.jlleitschuh.gradle.ktlint") version "13.0.0" } group = BuildSettings.GROUP From c7230d53ce380d4d30de0ee934f6a023dff50416 Mon Sep 17 00:00:00 2001 From: Danil-Didkovskiy Date: Wed, 9 Jul 2025 13:28:10 +0300 Subject: [PATCH 2/2] Fix ktlint errors --- .../jxbrowser/gradle/JxBrowserExtension.kt | 12 +++++++----- .../gradle/JxBrowserPluginFunctionalTest.kt | 15 ++++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserExtension.kt b/src/main/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserExtension.kt index cb12075..f2521bb 100644 --- a/src/main/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserExtension.kt +++ b/src/main/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserExtension.kt @@ -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,13 +187,14 @@ 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 { - return version.map { versionValue -> + private fun artifact(shortName: String): Provider = + version.map { versionValue -> checkArtifactSupported(shortName, versionValue) if (shortName == "core") { "$GROUP:jxbrowser:$versionValue" @@ -199,7 +202,6 @@ public open class JxBrowserExtension(private val project: Project) { "$GROUP:jxbrowser-$shortName:$versionValue" } } - } /** * Checks if the artifact with [shortName] exists in JxBrowser [version]. diff --git a/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginFunctionalTest.kt b/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginFunctionalTest.kt index 5f64d7b..8ce53ca 100644 --- a/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginFunctionalTest.kt +++ b/src/test/kotlin/com/teamdev/jxbrowser/gradle/JxBrowserPluginFunctionalTest.kt @@ -71,7 +71,8 @@ internal class JxBrowserPluginFunctionalTest { ) val result = - GradleRunner.create() + GradleRunner + .create() .withProjectDir(testProjectDir) .withPluginClasspath() .withArguments("build") @@ -132,7 +133,8 @@ internal class JxBrowserPluginFunctionalTest { ) val result = - GradleRunner.create() + GradleRunner + .create() .withProjectDir(testProjectDir) .withPluginClasspath() .withArguments(taskName) @@ -185,7 +187,8 @@ internal class JxBrowserPluginFunctionalTest { ) val result = - GradleRunner.create() + GradleRunner + .create() .withProjectDir(testProjectDir) .withPluginClasspath() .withArguments(taskName) @@ -220,7 +223,8 @@ internal class JxBrowserPluginFunctionalTest { val failure = assertFails { - GradleRunner.create() + GradleRunner + .create() .withProjectDir(testProjectDir) .withPluginClasspath() .withArguments("build") @@ -247,7 +251,8 @@ internal class JxBrowserPluginFunctionalTest { val failure = assertFails { - GradleRunner.create() + GradleRunner + .create() .withProjectDir(testProjectDir) .withPluginClasspath() .withArguments("check")