Skip to content

fix: replace kotlin min() and max() deprecated functions with minOrNull() #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2025
Merged

fix: replace kotlin min() and max() deprecated functions with minOrNull() #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...nse-gather-plugin/src/main/kotlin/com/github/vlsi/gradle/license/api/LicenseExpression.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ fun LicenseExpression.weight(): Int =
is JustLicense -> 1
is OrLaterLicense -> 2
is WithException -> license.weight() + 1
is ConjunctionLicenseExpression -> licenses.map { it.weight() + 1 }.max() ?: 1
is DisjunctionLicenseExpression -> licenses.map { it.weight() + 1 }.max() ?: 1
is ConjunctionLicenseExpression -> licenses.map { it.weight() + 1 }.maxOrNull() ?: 1
is DisjunctionLicenseExpression -> licenses.map { it.weight() + 1 }.maxOrNull() ?: 1
else -> TODO("Unexpected expression: ${this::class.simpleName}: $this")
}
4 changes: 2 additions & 2 deletions ...elease-plugin/src/main/kotlin/com/github/vlsi/gradle/release/Apache2LicenseInterpreter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class Apache2LicenseInterpreter {
return when (e) {
is DisjunctionLicenseExpression ->
// A or X => A
e.unordered.map { eval(it) }.min()
e.unordered.map { eval(it) }.minOrNull()
is ConjunctionLicenseExpression ->
e.unordered.map { eval(it) }.max()
e.unordered.map { eval(it) }.maxOrNull()
else -> null
} ?: AsfLicenseCategory.UNKNOWN
}
Expand Down
2 changes: 1 addition & 1 deletion ...e-release-plugin/src/main/kotlin/com/github/vlsi/gradle/release/StageVoteReleasePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ class StageVoteReleasePlugin @Inject constructor(private val instantiator: Insta
Pair(listOf(), mapOf())
}

val svnStagingRevision = stagedFiles.map { it.commit.revision }.max() ?: 0
val svnStagingRevision = stagedFiles.map { it.commit.revision }.maxOrNull() ?: 0

val releaseParams = ReleaseParams(
tlp = releaseExt.tlp.get(),
Expand Down
Loading