From 7eeef8c42e3b1bb108d79ba24d885b239e41f150 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:27:38 +0000 Subject: [PATCH 1/3] Bump org.jmailen.kotlinter from 3.9.0 to 4.3.0 Bumps org.jmailen.kotlinter from 3.9.0 to 4.3.0. --- updated-dependencies: - dependency-name: org.jmailen.kotlinter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 13bc9b76..2eb0d24c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ ben-manes-versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } -kotlinter = { id = "org.jmailen.kotlinter", version = "4.0.0" } +kotlinter = { id = "org.jmailen.kotlinter", version = "4.3.0" } gradle-plugin-publish = {id = "com.gradle.plugin-publish", version = "1.2.1" } From dcd8151553db6cf2507b9f599b93a91091e27e7a Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 13 Jun 2024 16:30:20 +0200 Subject: [PATCH 2/3] Fix formatting --- .../osacky/flank/gradle/FladlePluginDelegate.kt | 15 ++++++++++++--- .../com/osacky/flank/gradle/YamlWriterTest.kt | 16 ++++++++++++---- .../gradle/validation/ValidateExclusionsTest.kt | 2 +- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt b/fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt index ea878e0f..85cbe159 100644 --- a/fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt +++ b/fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt @@ -122,12 +122,21 @@ class FladlePluginDelegate { args = if (project.hasProperty("dumpShards")) { listOf( - "firebase", "test", "android", "run", "-c", - writeConfigProps.get().fladleConfigFile.get().asFile.absolutePath, "--dump-shards", + "firebase", + "test", + "android", + "run", + "-c", + writeConfigProps.get().fladleConfigFile.get().asFile.absolutePath, + "--dump-shards", ) } else { listOf( - "firebase", "test", "android", "run", "-c", + "firebase", + "test", + "android", + "run", + "-c", writeConfigProps.get().fladleConfigFile.get().asFile.absolutePath, ) } diff --git a/fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt b/fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt index 044b5d33..58e826b4 100644 --- a/fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt +++ b/fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt @@ -179,7 +179,9 @@ class YamlWriterTest { legacy-junit-result: false full-junit-result: false output-style: single - """.trimIndent() + '\n', + """.trimIndent() + + + '\n', ) } @@ -349,7 +351,9 @@ class YamlWriterTest { legacy-junit-result: false full-junit-result: false output-style: single - """.trimIndent() + '\n', + """.trimIndent() + + + '\n', ) } @@ -387,7 +391,9 @@ class YamlWriterTest { legacy-junit-result: false full-junit-result: false output-style: single - """.trimIndent() + '\n', + """.trimIndent() + + + '\n', ) } @@ -1002,7 +1008,9 @@ class YamlWriterTest { legacy-junit-result: false full-junit-result: false output-style: single - """.trimIndent() + '\n', + """.trimIndent() + + + '\n', ) } diff --git a/fladle-plugin/src/test/java/com/osacky/flank/gradle/validation/ValidateExclusionsTest.kt b/fladle-plugin/src/test/java/com/osacky/flank/gradle/validation/ValidateExclusionsTest.kt index 0b5d05b4..c9a7f514 100644 --- a/fladle-plugin/src/test/java/com/osacky/flank/gradle/validation/ValidateExclusionsTest.kt +++ b/fladle-plugin/src/test/java/com/osacky/flank/gradle/validation/ValidateExclusionsTest.kt @@ -26,7 +26,7 @@ class ValidateExclusionsTest { | instrumentationApk = "test.apk" | testShards.set(1) | maxTestShards.set(2) - | flankVersion.set("21.01.0") + | flankVersion.set("23.01.0") |} """.trimMargin(), ) From 47682205ea142be34cf4f92f74694526f7bc226c Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 13 Jun 2024 17:04:04 +0200 Subject: [PATCH 3/3] Fix formatting --- .../com/osacky/flank/gradle/YamlWriterTest.kt | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt b/fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt index 58e826b4..83bee5cc 100644 --- a/fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt +++ b/fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt @@ -178,10 +178,8 @@ class YamlWriterTest { smart-flank-disable-upload: false legacy-junit-result: false full-junit-result: false - output-style: single - """.trimIndent() - + - '\n', + output-style: single\n + """.trimIndent(), ) } @@ -350,10 +348,8 @@ class YamlWriterTest { smart-flank-disable-upload: false legacy-junit-result: false full-junit-result: false - output-style: single - """.trimIndent() - + - '\n', + output-style: single\n + """.trimIndent(), ) } @@ -390,10 +386,8 @@ class YamlWriterTest { smart-flank-disable-upload: false legacy-junit-result: false full-junit-result: false - output-style: single - """.trimIndent() - + - '\n', + output-style: single\n + """.trimIndent(), ) } @@ -1007,10 +1001,8 @@ class YamlWriterTest { smart-flank-disable-upload: false legacy-junit-result: false full-junit-result: false - output-style: single - """.trimIndent() - + - '\n', + output-style: single\n + """.trimIndent(), ) }