From 084df573113823ce531d02971628dfe32587a6db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 04:01:13 +0000 Subject: [PATCH 1/5] Bump gradle/wrapper-validation-action from 2 to 3 (#134) * Bump gradle/wrapper-validation-action from 2 to 3 Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2 to 3. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/v2...v3) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Update .github/workflows/ci.yml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zac Sweers --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7677f13..88dc215 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v4 - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v2 + uses: gradle/actions/wrapper-validation@v3 - name: Install JDK uses: actions/setup-java@v4 From 81a5fe35f7e8e668e5086a4275b4c65a6a94f580 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Mon, 13 May 2024 14:48:12 -0400 Subject: [PATCH 2/5] Update ktfmt to 0.49 (#137) --- gradle/libs.versions.toml | 2 +- .../cli/buildkite/BuildkiteDataBindings.kt | 18 ++++----- .../slack/cli/sarif/MergeSarifReports.kt | 3 +- .../cli/shellsentry/ResultProcessorTest.kt | 40 ++++++++++++++----- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f784891..38bb9b7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlin = "1.9.23" kotlinx-serialization = "1.6.3" ksp = "1.9.23-1.0.20" -ktfmt = "0.47" +ktfmt = "0.49" jvmTarget = "17" moshix = "0.25.1" moshi = "1.15.1" diff --git a/src/main/kotlin/slack/cli/buildkite/BuildkiteDataBindings.kt b/src/main/kotlin/slack/cli/buildkite/BuildkiteDataBindings.kt index 8ec6341..a3cb469 100644 --- a/src/main/kotlin/slack/cli/buildkite/BuildkiteDataBindings.kt +++ b/src/main/kotlin/slack/cli/buildkite/BuildkiteDataBindings.kt @@ -159,7 +159,7 @@ public data class MultiChannelMessage( @Serializable public enum class GithubNotification(public val value: String) { @SerialName("github_check") GithubCheck("github_check"), - @SerialName("github_commit_status") GithubCommitStatus("github_commit_status") + @SerialName("github_commit_status") GithubCommitStatus("github_commit_status"), } @Serializable @@ -404,7 +404,7 @@ public data class BlockStep( public enum class BlockedState(public val value: String) { @SerialName("failed") Failed("failed"), @SerialName("passed") Passed("passed"), - @SerialName("running") Running("running") + @SerialName("running") Running("running"), } /** The step keys for a step to depend on */ @@ -640,7 +640,7 @@ public data class ScriptStep( @Serializable public enum class ConcurrencyMethod(public val value: String) { @SerialName("eager") Eager("eager"), - @SerialName("ordered") Ordered("ordered") + @SerialName("ordered") Ordered("ordered"), } @Serializable @@ -847,7 +847,7 @@ public enum class SignalReason(public val value: String) { @SerialName("cancel") Cancel("cancel"), @SerialName("*") Empty("*"), @SerialName("none") None("none"), - @SerialName("process_run_error") ProcessRunError("process_run_error") + @SerialName("process_run_error") ProcessRunError("process_run_error"), } /** Whether to allow a job to be retried manually */ @@ -892,7 +892,7 @@ public data class Signature( public enum class ScriptType(public val value: String) { @SerialName("command") Command("command"), @SerialName("commands") Commands("commands"), - @SerialName("script") Script("script") + @SerialName("script") Script("script"), } @Serializable @@ -1094,7 +1094,7 @@ public enum class StepType(public val value: String) { @SerialName("script") Script("script"), @SerialName("trigger") Trigger("trigger"), @SerialName("wait") Wait("wait"), - @SerialName("waiter") Waiter("waiter") + @SerialName("waiter") Waiter("waiter"), } @Serializable @@ -1138,7 +1138,7 @@ public data class WaitStep( @Serializable public enum class WaitType(public val value: String) { @SerialName("wait") Wait("wait"), - @SerialName("waiter") Waiter("waiter") + @SerialName("waiter") Waiter("waiter"), } /** @@ -1151,7 +1151,7 @@ public enum class StringStep(public val value: String) { @SerialName("block") Block("block"), @SerialName("input") Input("input"), @SerialName("wait") Wait("wait"), - @SerialName("waiter") Waiter("waiter") + @SerialName("waiter") Waiter("waiter"), } @Serializable @@ -1164,5 +1164,5 @@ public enum class NestedBlockStepType(public val value: String) { @SerialName("script") Script("script"), @SerialName("trigger") Trigger("trigger"), @SerialName("wait") Wait("wait"), - @SerialName("waiter") Waiter("waiter") + @SerialName("waiter") Waiter("waiter"), } diff --git a/src/main/kotlin/slack/cli/sarif/MergeSarifReports.kt b/src/main/kotlin/slack/cli/sarif/MergeSarifReports.kt index 56ed771..d12b2d7 100644 --- a/src/main/kotlin/slack/cli/sarif/MergeSarifReports.kt +++ b/src/main/kotlin/slack/cli/sarif/MergeSarifReports.kt @@ -202,7 +202,8 @@ public class MergeSarifReports : CliktCommand(help = DESCRIPTION) { mapOf( SRC_ROOT to originalUri.copy( - uri = "file://${projectDir + uri = + "file://${projectDir .toFile().canonicalPath}/" ) ), diff --git a/src/test/kotlin/slack/cli/shellsentry/ResultProcessorTest.kt b/src/test/kotlin/slack/cli/shellsentry/ResultProcessorTest.kt index 51c65c4..8d1d817 100644 --- a/src/test/kotlin/slack/cli/shellsentry/ResultProcessorTest.kt +++ b/src/test/kotlin/slack/cli/shellsentry/ResultProcessorTest.kt @@ -124,7 +124,9 @@ class ResultProcessorTest(private val useExtensions: Boolean) { outputFile.writeText( """ ${KnownIssues.ftlRateLimit.matchingText} - """.trimIndent().padWithTestLogs() + """ + .trimIndent() + .padWithTestLogs() ) val signal = newProcessor().process("", 1, outputFile.toPath(), isAfterRetry = false) check(signal is RetrySignal.RetryDelayed) @@ -136,7 +138,9 @@ class ResultProcessorTest(private val useExtensions: Boolean) { outputFile.writeText( """ ${KnownIssues.oom.matchingText} - """.trimIndent().padWithTestLogs() + """ + .trimIndent() + .padWithTestLogs() ) val signal = newProcessor().process("", 1, outputFile.toPath(), isAfterRetry = false) check(signal is RetrySignal.RetryImmediately) @@ -148,7 +152,9 @@ class ResultProcessorTest(private val useExtensions: Boolean) { outputFile.writeText( """ ${KnownIssues.fakeFailure.matchingText} - """.trimIndent().padWithTestLogs() + """ + .trimIndent() + .padWithTestLogs() ) val signal = newProcessor().process("", 1, outputFile.toPath(), isAfterRetry = false) check(signal is RetrySignal.Ack) @@ -157,9 +163,13 @@ class ResultProcessorTest(private val useExtensions: Boolean) { @Test fun matchingPattern_matches() { val outputFile = tmpFolder.newFile("logs.txt") - outputFile.writeText(""" + outputFile.writeText( + """ FAKE_FAILURE_a - """.trimIndent().padWithTestLogs()) + """ + .trimIndent() + .padWithTestLogs() + ) val signal = newProcessor().process("", 1, outputFile.toPath(), isAfterRetry = false) check(signal is RetrySignal.Ack) } @@ -167,9 +177,13 @@ class ResultProcessorTest(private val useExtensions: Boolean) { @Test fun matchingPattern_doesNotMatch() { val outputFile = tmpFolder.newFile("logs.txt") - outputFile.writeText(""" + outputFile.writeText( + """ FAKE_FAILURE-a - """.trimIndent().padWithTestLogs()) + """ + .trimIndent() + .padWithTestLogs() + ) val signal = newProcessor().process("", 1, outputFile.toPath(), isAfterRetry = false) check(signal is RetrySignal.Unknown) } @@ -183,7 +197,9 @@ class ResultProcessorTest(private val useExtensions: Boolean) { Publishing build scan... $scanUrl - """.trimIndent().padWithTestLogs() + """ + .trimIndent() + .padWithTestLogs() // Assert in both directions they match assertThat(log.lines().parseBuildScan(url)).isEqualTo(scanUrl) @@ -194,9 +210,13 @@ class ResultProcessorTest(private val useExtensions: Boolean) { fun lowConfidenceMatch_isSkipped() { assumeTrue(useExtensions) val outputFile = tmpFolder.newFile("logs.txt") - outputFile.writeText(""" + outputFile.writeText( + """ FAKE_FAILURE_a - """.trimIndent().padWithTestLogs()) + """ + .trimIndent() + .padWithTestLogs() + ) val signal = newProcessor(config = ShellSentryConfig(knownIssues = emptyList(), minConfidence = 100)) .process("", 1, outputFile.toPath(), isAfterRetry = false) From 5fa2b3468a99fc243747279c80dd239c420cba5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:47:43 +0000 Subject: [PATCH 3/5] Bump dev.zacsweers.moshix from 0.25.1 to 0.26.0 (#141) Bumps [dev.zacsweers.moshix](https://github.com/ZacSweers/MoshiX) from 0.25.1 to 0.26.0. - [Release notes](https://github.com/ZacSweers/MoshiX/releases) - [Changelog](https://github.com/ZacSweers/MoshiX/blob/main/CHANGELOG.md) - [Commits](https://github.com/ZacSweers/MoshiX/compare/0.25.1...0.26.0) --- updated-dependencies: - dependency-name: dev.zacsweers.moshix dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 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 38bb9b7..dec0497 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ kotlinx-serialization = "1.6.3" ksp = "1.9.23-1.0.20" ktfmt = "0.49" jvmTarget = "17" -moshix = "0.25.1" +moshix = "0.26.0" moshi = "1.15.1" tikxml = "0.8.15" xmlutil = "0.86.3" From 57e72dbbd94738d27dabc41f0ea58df2803687e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:47:52 +0000 Subject: [PATCH 4/5] Bump com.android.lint from 8.3.2 to 8.4.0 (#138) Bumps com.android.lint from 8.3.2 to 8.4.0. --- updated-dependencies: - dependency-name: com.android.lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 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 dec0497..a9ae0d1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ xmlutil = "0.86.3" [plugins] detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.6" } dokka = { id = "org.jetbrains.dokka", version = "1.9.20" } -lint = { id = "com.android.lint", version = "8.3.2" } +lint = { id = "com.android.lint", version = "8.4.0" } mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.28.0" } moshix = { id = "dev.zacsweers.moshix", version.ref = "moshix" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } From d33c56a1c5e78d9670adc13a16d60cab88bd134b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:51:23 +0000 Subject: [PATCH 5/5] Bump kotlin from 1.9.23 to 1.9.24 (#139) * Bump kotlin from 1.9.23 to 1.9.24 Bumps `kotlin` from 1.9.23 to 1.9.24. Updates `org.jetbrains.kotlin:kotlin-reflect` from 1.9.23 to 1.9.24 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.24/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.23...v1.9.24) Updates `org.jetbrains.kotlin.jvm` from 1.9.23 to 1.9.24 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.24/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.23...v1.9.24) Updates `org.jetbrains.kotlin.plugin.serialization` from 1.9.23 to 1.9.24 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.24/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.23...v1.9.24) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update libs.versions.toml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zac Sweers --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a9ae0d1..a442710 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "1.9.23" +kotlin = "1.9.24" kotlinx-serialization = "1.6.3" -ksp = "1.9.23-1.0.20" +ksp = "1.9.24-1.0.20" ktfmt = "0.49" jvmTarget = "17" moshix = "0.26.0" @@ -39,4 +39,4 @@ junit = "junit:junit:4.13.2" tikxml-htmlEscape = { module = "com.tickaroo.tikxml:converter-htmlescape", version.ref = "tikxml" } truth = "com.google.truth:truth:1.4.2" xmlutil-core = { module = "io.github.pdvrieze.xmlutil:core", version.ref = "xmlutil" } -xmlutil-serialization = { module = "io.github.pdvrieze.xmlutil:serialization", version.ref = "xmlutil" } \ No newline at end of file +xmlutil-serialization = { module = "io.github.pdvrieze.xmlutil:serialization", version.ref = "xmlutil" }