Skip to content
This repository was archived by the owner on Oct 14, 2024. It is now read-only.

Commit df0fc3b

Browse files
dependabot[bot]ZacSweers
dependabot[bot]
and
ZacSweers
authored
Bump org.jetbrains.kotlinx.binary-compatibility-validator from 0.13.2 to 0.14.0 (#108)
* Bump org.jetbrains.kotlinx.binary-compatibility-validator Bumps [org.jetbrains.kotlinx.binary-compatibility-validator](https://github.com/Kotlin/binary-compatibility-validator) from 0.13.2 to 0.14.0. - [Release notes](https://github.com/Kotlin/binary-compatibility-validator/releases) - [Commits](Kotlin/binary-compatibility-validator@0.13.2...0.14.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx.binary-compatibility-validator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * ktfmt 0.47 * JDK 21 * Regen API * Spotless --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zac Sweers <pandanomic@gmail.com>
1 parent e48f34c commit df0fc3b

25 files changed

+77
-98
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-java@v4
2828
with:
2929
distribution: 'zulu'
30-
java-version: '20'
30+
java-version: '21'
3131

3232
- name: Build and test
3333
uses: gradle/gradle-build-action@v2

‎api/kotlin-cli-util.api

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3502,10 +3502,6 @@ public final class slack/cli/sarif/MergeSarifReports$Factory : slack/cli/Command
35023502
public fun getKey ()Ljava/lang/String;
35033503
}
35043504

3505-
public synthetic class slack/cli/sarif/SarifUtilKt$EntriesMappings {
3506-
public static final synthetic field entries$0 Lkotlin/enums/EnumEntries;
3507-
}
3508-
35093505
public final class slack/cli/shellsentry/AnalysisResult {
35103506
public fun <init> (Ljava/lang/String;Ljava/lang/String;Lslack/cli/shellsentry/RetrySignal;ILkotlin/jvm/functions/Function1;)V
35113507
public final fun component1 ()Ljava/lang/String;

‎build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ spotless {
5252
endWithNewline()
5353
licenseHeaderFile(
5454
"spotless/spotless.kt",
55-
"(import|plugins|buildscript|dependencies|pluginManagement)"
55+
"(import|plugins|buildscript|dependencies|pluginManagement)",
5656
)
5757
}
5858
}
5959

60-
configure<JavaPluginExtension> { toolchain { languageVersion.set(JavaLanguageVersion.of(20)) } }
60+
configure<JavaPluginExtension> { toolchain { languageVersion.set(JavaLanguageVersion.of(21)) } }
6161

6262
tasks.withType<JavaCompile>().configureEach {
6363
options.release.set(libs.versions.jvmTarget.get().toInt())

‎gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kotlin = "1.9.22"
33
kotlinx-serialization = "1.6.2"
44
ksp = "1.9.22-1.0.17"
5-
ktfmt = "0.46"
5+
ktfmt = "0.47"
66
jvmTarget = "17"
77
moshix = "0.25.1"
88
moshi = "1.15.1"
@@ -19,7 +19,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
1919
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
2020
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
2121
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
22-
binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
22+
binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.14.0" }
2323
retry = { id = "org.gradle.test-retry", version = "1.5.8" }
2424

2525
[libraries]

‎src/main/kotlin/slack/cli/CliUtil.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public fun Sequence<File>.filterByExtension(extension: String): Sequence<File> {
7575
/** Filters by a specific [name]. */
7676
public fun Sequence<File>.filterByName(
7777
name: String,
78-
withoutExtension: Boolean = true
78+
withoutExtension: Boolean = true,
7979
): Sequence<File> {
8080
return if (withoutExtension) {
8181
filter { it.nameWithoutExtension == name }
@@ -94,7 +94,7 @@ public fun Sequence<Path>.filterByExtension(extension: String): Sequence<Path> {
9494
@JvmName("filterByNamePath")
9595
public fun Sequence<Path>.filterByName(
9696
name: String,
97-
withoutExtension: Boolean = true
97+
withoutExtension: Boolean = true,
9898
): Sequence<Path> {
9999
return if (withoutExtension) {
100100
filter { it.nameWithoutExtension == name }

‎src/main/kotlin/slack/cli/CliktExtensions.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@file:Suppress(
1717
"LongParameterList", // These are how many parameters are in Clikt options.
1818
"SpreadOperator", // Not spreading would change semantics.
19-
"unused"
19+
"unused",
2020
)
2121

2222
package slack.cli
@@ -34,14 +34,14 @@ import java.nio.file.Paths
3434
/** A dry run option for [clikt commands][CliktCommand]. */
3535
public fun CliktCommand.dryRunOption(
3636
vararg names: String = arrayOf("--dry-run"),
37-
help: String = "Runs this as a dry run, no modifications."
37+
help: String = "Runs this as a dry run, no modifications.",
3838
): OptionWithValues<Boolean, Boolean, Boolean> =
3939
option(names = names, help = help).flag(default = false)
4040

4141
/** A project dir option for [clikt commands][CliktCommand]. */
4242
public fun CliktCommand.projectDirOption(
4343
vararg names: String = arrayOf("--project-dir"),
44-
help: String = "The project directory. Defaults to the current working directory."
44+
help: String = "The project directory. Defaults to the current working directory.",
4545
): OptionDelegate<Path> =
4646
option(names = names, help = help).path(mustExist = true, canBeFile = false).defaultLazy {
4747
Paths.get("").toAbsolutePath()

‎src/main/kotlin/slack/cli/buildkite/BuildkiteDataBindings.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ public data class ExternalNotification(
130130
@Serializable
131131
public data class GithubCheck(
132132
/** GitHub commit status name */
133-
val context: String? = null,
133+
val context: String? = null
134134
)
135135

136136
@Serializable
137137
public data class GithubCommitStatus(
138138
/** GitHub commit status name */
139-
val context: String? = null,
139+
val context: String? = null
140140
)
141141

142142
@Serializable
@@ -715,7 +715,7 @@ public sealed interface SoftFail {
715715
@Serializable
716716
public data class SoftFailElement(
717717
/** The exit status number that will cause this job to soft-fail */
718-
@SerialName("exit_status") val exitStatus: ExitStatusUnion? = null,
718+
@SerialName("exit_status") val exitStatus: ExitStatusUnion? = null
719719
)
720720

721721
@Serializable
@@ -764,9 +764,7 @@ public sealed interface Setup {
764764
public sealed interface Plugins {
765765
@Serializable
766766
@JvmInline
767-
public value class AnythingMapValue(
768-
public val value: JsonObject,
769-
) : Plugins
767+
public value class AnythingMapValue(public val value: JsonObject) : Plugins
770768

771769
@Serializable
772770
@JvmInline

‎src/main/kotlin/slack/cli/buildkite/Extensions.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,15 @@ public object Conditions {
6464

6565
public fun githubStatusNotif(
6666
context: String,
67-
notifyIf: String = Conditions.NOT_CANCELLING
67+
notifyIf: String = Conditions.NOT_CANCELLING,
6868
): Notification =
6969
Notification(
7070
ExternalNotification(
7171
githubCommitStatus = GithubCommitStatus(context = context),
72-
notifyIf = notifyIf
72+
notifyIf = notifyIf,
7373
)
7474
)
7575

7676
public fun CommandStep.withGithubStatus(context: String): CommandStep {
77-
return copy(
78-
notify = listOf(githubStatusNotif(context)),
79-
)
77+
return copy(notify = listOf(githubStatusNotif(context)))
8078
}

‎src/main/kotlin/slack/cli/buildkite/JsonElementKamlSerializers.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ internal object JsonObjectAsMapSerializer : KSerializer<JsonObject> {
5353
buildClassSerialDescriptor("JsonObjectAsMap") {
5454
element(
5555
"properties",
56-
mapSerialDescriptor(String.serializer().descriptor, JsonElementKamlSerializer.descriptor)
56+
mapSerialDescriptor(String.serializer().descriptor, JsonElementKamlSerializer.descriptor),
5757
)
5858
}
5959

6060
override fun serialize(encoder: Encoder, value: JsonObject) {
6161
val map = value.mapValues { it.value }
6262
encoder.encodeSerializableValue(
6363
MapSerializer(String.serializer(), JsonElementKamlSerializer),
64-
map
64+
map,
6565
)
6666
}
6767

@@ -132,7 +132,7 @@ internal object JsonPrimitiveSerializer : KSerializer<JsonPrimitive> {
132132
throw JsonDecodingException(
133133
-1,
134134
"Unexpected JSON element, expected JsonPrimitive, had ${result::class}",
135-
result.toString()
135+
result.toString(),
136136
)
137137
}
138138
return result
@@ -205,7 +205,7 @@ private object JsonLiteralSerializer : KSerializer<JsonLiteral> {
205205
throw JsonDecodingException(
206206
-1,
207207
"Unexpected JSON element, expected JsonLiteral, had ${result::class}",
208-
result.toString()
208+
result.toString(),
209209
)
210210
}
211211
return result

‎src/main/kotlin/slack/cli/gradle/GradleProjectFlattenerCli.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class GradleProjectFlattenerCli : CliktCommand(help = DESCRIPTION) {
6868
"-s",
6969
help =
7070
"The settings.gradle file to use. Note this file _must_ only have a single, top-level `include()` call " +
71-
"with vararg project args."
71+
"with vararg project args.",
7272
)
7373
.path(mustExist = true, canBeDir = false)
7474
.required()

‎src/main/kotlin/slack/cli/gradle/GradleSettingsVerifierCli.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class GradleSettingsVerifierCli : CliktCommand(help = DESCRIPTION) {
6161
"-s",
6262
help =
6363
"The settings.gradle file to use. Note this file _must_ only have a single, top-level `include()` call " +
64-
"with vararg project args."
64+
"with vararg project args.",
6565
)
6666
.path(mustExist = true, canBeDir = false)
6767
.required()
@@ -71,15 +71,15 @@ public class GradleSettingsVerifierCli : CliktCommand(help = DESCRIPTION) {
7171
"--implicit-path",
7272
"-i",
7373
help =
74-
"Implicit project names that may not be present in the settings file but should be assumed present."
74+
"Implicit project names that may not be present in the settings file but should be assumed present.",
7575
)
7676
.multiple()
7777

7878
private val deleteUnIncludedPaths by
7979
option(
8080
"--delete-un-included-paths",
8181
"-d",
82-
help = "Delete any paths that are not included in the settings file."
82+
help = "Delete any paths that are not included in the settings file.",
8383
)
8484
.flag()
8585

@@ -143,19 +143,19 @@ public class GradleSettingsVerifierCli : CliktCommand(help = DESCRIPTION) {
143143
!realPath.exists() -> {
144144
reportError(
145145
"Project dir '${realPath.relativeTo(projectDir)}' does not exist.",
146-
line.indexOfFirst { !it.isWhitespace() }
146+
line.indexOfFirst { !it.isWhitespace() },
147147
)
148148
}
149149
!realPath.resolve("build.gradle.kts").exists() -> {
150150
reportError(
151151
"Project build file '${realPath.relativeTo(projectDir).resolve("build.gradle.kts")}' does not exist.",
152-
line.indexOfFirst { !it.isWhitespace() }
152+
line.indexOfFirst { !it.isWhitespace() },
153153
)
154154
}
155155
!realPath.isDirectory() -> {
156156
reportError(
157157
"Expected '$realPath' to be a directory.",
158-
line.indexOfFirst { !it.isWhitespace() }
158+
line.indexOfFirst { !it.isWhitespace() },
159159
)
160160
}
161161
}

‎src/main/kotlin/slack/cli/lint/LintBaselineMergerCli.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public class LintBaselineMergerCli : CliktCommand(DESCRIPTION) {
9393
help =
9494
"Template for messages with each issue. This message can optionally " +
9595
"contain '{id}' in it to be replaced with the issue ID and '{message}' " +
96-
"for the original message."
96+
"for the original message.",
9797
)
9898
.default("{message}")
9999

@@ -117,7 +117,7 @@ public class LintBaselineMergerCli : CliktCommand(DESCRIPTION) {
117117
name = issue.id,
118118
shortDescription = MultiformatMessageString(text = issue.message),
119119
fullDescription = MultiformatMessageString(text = issue.message),
120-
defaultConfiguration = ReportingConfiguration(level = Level.Error)
120+
defaultConfiguration = ReportingConfiguration(level = Level.Error),
121121
)
122122
}
123123
.sortedBy { it.id }
@@ -141,7 +141,7 @@ public class LintBaselineMergerCli : CliktCommand(DESCRIPTION) {
141141
{ it.id },
142142
{ it.location.file },
143143
{ it.location.line },
144-
{ it.location.column }
144+
{ it.location.column },
145145
)
146146
)
147147
.map { key -> key to issues.getValue(key) }
@@ -157,11 +157,11 @@ public class LintBaselineMergerCli : CliktCommand(DESCRIPTION) {
157157
Message(
158158
text =
159159
messageTemplate.replace("{id}", id).replace("{message}", issue.message)
160-
)
160+
),
161161
)
162-
}
162+
},
163163
)
164-
)
164+
),
165165
)
166166

167167
SarifSerializer.toJson(outputSarif).let { outputFile.writeText(it) }
@@ -212,7 +212,7 @@ public class LintBaselineMergerCli : CliktCommand(DESCRIPTION) {
212212
@Serializable(HtmlEscapeStringSerializer::class) val name: String,
213213
@Serializable(HtmlEscapeStringSerializer::class) val variant: String,
214214
@Serializable(HtmlEscapeStringSerializer::class) val version: String,
215-
val issues: List<LintIssue>
215+
val issues: List<LintIssue>,
216216
) {
217217
@Serializable
218218
@XmlSerialName("issue")
@@ -269,8 +269,8 @@ public class LintBaselineMergerCli : CliktCommand(DESCRIPTION) {
269269
$errorLine2
270270
"""
271271
.trimIndent()
272-
)
273-
)
272+
),
273+
),
274274
)
275275
)
276276
}

‎src/main/kotlin/slack/cli/sarif/ApplyBaselinesToSarifs.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class ApplyBaselinesToSarifs : CliktCommand(help = DESCRIPTION) {
6565
"--remove-uri-prefixes",
6666
help =
6767
"When enabled, removes the root project directory from location uris such that they are only " +
68-
"relative to the root project dir."
68+
"relative to the root project dir.",
6969
)
7070
.flag()
7171

@@ -172,7 +172,7 @@ public class ApplyBaselinesToSarifs : CliktCommand(help = DESCRIPTION) {
172172
newCurrentSchema.mergeWith(
173173
absentResultsSchema,
174174
removeUriPrefixes = removeUriPrefixes,
175-
log = ::echo
175+
log = ::echo,
176176
)
177177
}
178178
}

‎src/main/kotlin/slack/cli/sarif/MergeSarifReports.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class MergeSarifReports : CliktCommand(help = DESCRIPTION) {
6666
option(
6767
"--remap-src-roots",
6868
help =
69-
"When enabled, remaps uri roots to include the subproject path (relative to the root project)."
69+
"When enabled, remaps uri roots to include the subproject path (relative to the root project).",
7070
)
7171
.flag()
7272

@@ -75,15 +75,15 @@ public class MergeSarifReports : CliktCommand(help = DESCRIPTION) {
7575
"--remove-uri-prefixes",
7676
help =
7777
"When enabled, removes the root project directory from location uris such that they are only " +
78-
"relative to the root project dir."
78+
"relative to the root project dir.",
7979
)
8080
.flag()
8181

8282
private val allowEmpty by
8383
option(
8484
"--allow-empty",
8585
help = "Flag to allow graceful exiting if no sarif files are found.",
86-
envvar = "SARIF_MERGING_ALLOW_EMPTY"
86+
envvar = "SARIF_MERGING_ALLOW_EMPTY",
8787
)
8888
.flag()
8989

@@ -229,7 +229,7 @@ public class MergeSarifReports : CliktCommand(help = DESCRIPTION) {
229229
)
230230
}
231231
)
232-
}
232+
},
233233
)
234234
}
235235
)

‎src/main/kotlin/slack/cli/sarif/SarifUtil.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import java.util.Objects
2929
internal val BASELINE_SUPPRESSION: Suppression =
3030
Suppression(
3131
kind = SuppressionKind.External,
32-
justification = "This issue was suppressed by the baseline"
32+
justification = "This issue was suppressed by the baseline",
3333
)
3434

3535
/**
@@ -97,7 +97,7 @@ internal fun CliktCommand.levelOption(): NullableOption<Level, Level> {
9797
return option(
9898
"--level",
9999
"-l",
100-
help = "Priority level. Defaults to Error. Options are $LEVEL_NAMES"
100+
help = "Priority level. Defaults to Error. Options are $LEVEL_NAMES",
101101
)
102102
.enum<Level>()
103103
}

0 commit comments

Comments
 (0)