From 630916e827330cde830ad39facbb122b0c61ca70 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:47:49 +0000 Subject: [PATCH] chore(deps): update kotlin monorepo to v2.1.0 (#686) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update kotlin monorepo to v2.1.0 * use latest ktlint * Fix multiplatform project --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mateusz Kwieciński --- build.gradle | 6 ++++++ gradle/libs.versions.toml | 2 +- .../starter/modules/MultiplatformLibraryPluginTest.kt | 4 +++- .../starter/quality/MultiplatformQualityPluginTest.kt | 4 +++- .../starter/quality/tasks/IssueLinksCheckerTaskTest.kt | 4 +++- .../starter/versioning/MultiplatformVersioningPluginTest.kt | 4 +++- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 49c2e69b..99745fa7 100644 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,12 @@ allprojects { } } + pluginManager.withPlugin("io.github.usefulness.ktlint-gradle-plugin") { + ktlint { + ktlintVersion = libs.versions.maven.ktlint.get() + } + } + pluginManager.withPlugin(libs.plugins.kotlin.samwithreceiver.get().pluginId) { samWithReceiver { annotation("org.gradle.api.HasImplicitReceiver") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index de9b34be..f2204d9d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ gradle-gradlepublish = "1.3.0" gradle-jacocotestkit = "1.0.12" gradle-detekt = "1.23.7" gradle-doctor = "0.10.0" -mavencentral-kotlin = "2.0.21" +mavencentral-kotlin = "2.1.0" mavencentral-issuechecker = "0.4.0" mavencentral-junit = "5.11.3" mavencentral-assertj = "3.26.3" diff --git a/multiplatform/src/test/kotlin/com/project/starter/modules/MultiplatformLibraryPluginTest.kt b/multiplatform/src/test/kotlin/com/project/starter/modules/MultiplatformLibraryPluginTest.kt index 3df4615b..b7ca387d 100644 --- a/multiplatform/src/test/kotlin/com/project/starter/modules/MultiplatformLibraryPluginTest.kt +++ b/multiplatform/src/test/kotlin/com/project/starter/modules/MultiplatformLibraryPluginTest.kt @@ -87,7 +87,9 @@ internal class MultiplatformLibraryPluginTest : WithGradleProjectTest() { kotlin { jvm() - ios() + iosX64() + iosArm64() + iosSimulatorArm64() sourceSets { commonTest { diff --git a/multiplatform/src/test/kotlin/com/project/starter/quality/MultiplatformQualityPluginTest.kt b/multiplatform/src/test/kotlin/com/project/starter/quality/MultiplatformQualityPluginTest.kt index bc0d7c06..a770fe91 100644 --- a/multiplatform/src/test/kotlin/com/project/starter/quality/MultiplatformQualityPluginTest.kt +++ b/multiplatform/src/test/kotlin/com/project/starter/quality/MultiplatformQualityPluginTest.kt @@ -21,7 +21,9 @@ internal class MultiplatformQualityPluginTest : WithGradleProjectTest() { kotlin { jvm() - ios() + iosX64() + iosArm64() + iosSimulatorArm64() } """.trimIndent() resolve("build.gradle") { diff --git a/multiplatform/src/test/kotlin/com/project/starter/quality/tasks/IssueLinksCheckerTaskTest.kt b/multiplatform/src/test/kotlin/com/project/starter/quality/tasks/IssueLinksCheckerTaskTest.kt index d3a344a1..091b725e 100644 --- a/multiplatform/src/test/kotlin/com/project/starter/quality/tasks/IssueLinksCheckerTaskTest.kt +++ b/multiplatform/src/test/kotlin/com/project/starter/quality/tasks/IssueLinksCheckerTaskTest.kt @@ -20,7 +20,9 @@ internal class IssueLinksCheckerTaskTest : WithGradleProjectTest() { kotlin { jvm() - ios() + iosX64() + iosArm64() + iosSimulatorArm64() } """.trimIndent() diff --git a/multiplatform/src/test/kotlin/com/project/starter/versioning/MultiplatformVersioningPluginTest.kt b/multiplatform/src/test/kotlin/com/project/starter/versioning/MultiplatformVersioningPluginTest.kt index 8a203969..6b933e67 100644 --- a/multiplatform/src/test/kotlin/com/project/starter/versioning/MultiplatformVersioningPluginTest.kt +++ b/multiplatform/src/test/kotlin/com/project/starter/versioning/MultiplatformVersioningPluginTest.kt @@ -31,7 +31,9 @@ internal class MultiplatformVersioningPluginTest : WithGradleProjectTest() { } kotlin { - ios() + iosX64() + iosArm64() + iosSimulatorArm64() } """.trimIndent(), )