User: rednesto Date: 08 Jul 23 22:09 Revision: 7f8bf649090c9226423a7da0901bc320c601db6d Summary: Merge branch '2022.2' into 2022.3 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8605&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision 71110b4eab68e4ddc1a2459f902926067507e93d) +++ build.gradle.kts (revision 7f8bf649090c9226423a7da0901bc320c601db6d) @@ -29,12 +29,12 @@ import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask plugins { - kotlin("jvm") version "1.8.0" + kotlin("jvm") version "1.9.0" java mcdev groovy idea - id("org.jetbrains.intellij") version "1.14.1" + id("org.jetbrains.intellij") version "1.15.0" id("org.cadixdev.licenser") id("org.jlleitschuh.gradle.ktlint") version "10.3.0" } @@ -278,7 +278,7 @@ exclude("com/demonwav/mcdev/platform/mixin/invalidInjectorMethodSignature/*.java") - tasks { + this.tasks { register("gradle") { files.from( fileTree(project.projectDir) { Index: src/main/kotlin/util/utils.kt =================================================================== --- src/main/kotlin/util/utils.kt (revision 71110b4eab68e4ddc1a2459f902926067507e93d) +++ src/main/kotlin/util/utils.kt (revision 7f8bf649090c9226423a7da0901bc320c601db6d) @@ -374,3 +374,11 @@ fun withSuppressed(original: T?, other: T): T = original?.apply { addSuppressed(other) } ?: other + +fun S.ifNotBlank(block: (S) -> R): R? { + if (this.isNotBlank()) { + return block(this) + } + + return null +}