Skip to content

Commit

Permalink
Merge branch 'master' into zumegradle-rewrite
Browse files Browse the repository at this point in the history
# Conflicts:
#	buildSrc/src/main/kotlin/dev/nolij/zumegradle/JarCompressing.kt
  • Loading branch information
rhysdh540 committed Nov 5, 2024
2 parents 474191e + cdda047 commit 3d6d7e6
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,13 @@ val patchHistory = releaseTags
.map { name -> name.substring(minorTagPrefix.length) }

val maxPatch = patchHistory.maxOfOrNull { it.substringBefore('-').toInt() }
val patch = maxPatch.let {
if (it != null) {
if (patchHistory.contains(it.toString())) {
it + releaseIncrement
} else {
it
}
} else 0
}
val patch =
maxPatch?.plus(
if (patchHistory.contains(maxPatch.toString()))
releaseIncrement
else
0
) ?: 0
var patchAndSuffix = patch.toString()

if (releaseChannel.suffix != null) {
Expand Down

0 comments on commit 3d6d7e6

Please sign in to comment.