Skip to content

Commit 7d74656

Browse files
committed
Initial userdev update for dev bundle v8
1 parent 2a2b535 commit 7d74656

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

buildSrc/src/main/kotlin/config-kotlin.gradle.kts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,19 @@ plugins.apply("com.diffplug.spotless")
103103
extensions.configure<SpotlessExtension> {
104104
val overrides = mapOf(
105105
"ktlint_standard_no-wildcard-imports" to "disabled",
106+
"ktlint_standard_class-signature" to "disabled",
106107
"ktlint_standard_filename" to "disabled",
108+
"ktlint_standard_function-expression-body" to "disabled",
109+
"ktlint_standard_function-signature" to "disabled",
110+
"ktlint_standard_if-else-wrapping" to "disabled",
111+
"ktlint_standard_multiline-if-else" to "disabled",
112+
"ktlint_standard_multiline-expression-wrapping" to "disabled",
113+
"ktlint_standard_property-naming" to "disabled",
107114
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
108115
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
109116
)
110117

111-
val ktlintVer = "0.50.0"
118+
val ktlintVer = "1.5.0"
112119

113120
kotlin {
114121
ktlint(ktlintVer).editorConfigOverride(overrides)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ mockk = "io.mockk:mockk:1.14.9"
4848

4949
# Gradle
5050
gradle-licenser = "net.kyori:indra-licenser-spotless:4.0.0"
51-
gradle-spotless = "com.diffplug.spotless:spotless-plugin-gradle:8.0.0"
51+
gradle-spotless = "com.diffplug.spotless:spotless-plugin-gradle:8.1.0"
5252
gradle-shadow = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.2"
5353
gradle-kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:6.4.2"
5454
gradle-plugin-kotlin = { module = "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin" }

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/v7/SetupHandlerImplV7.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import io.papermc.paperweight.userdev.internal.setup.UserdevSetup
3434
import io.papermc.paperweight.userdev.internal.setup.UserdevSetupTask
3535
import io.papermc.paperweight.userdev.internal.setup.action.ApplyDevBundlePatchesAction
3636
import io.papermc.paperweight.userdev.internal.setup.action.ExtractFromBundlerAction
37-
import io.papermc.paperweight.userdev.internal.setup.action.RunRemappingCodebookAction
3837
import io.papermc.paperweight.userdev.internal.setup.action.RunPaperclipAction
38+
import io.papermc.paperweight.userdev.internal.setup.action.RunRemappingCodebookAction
3939
import io.papermc.paperweight.userdev.internal.setup.action.SetupMacheSourcesAction
4040
import io.papermc.paperweight.userdev.internal.setup.action.VanillaServerDownloads
4141
import io.papermc.paperweight.util.*

0 commit comments

Comments
 (0)