Skip to content

Commit fb5473c

Browse files
committed
build & dependency updates
1 parent 1d06ab4 commit fb5473c

8 files changed

Lines changed: 43 additions & 24 deletions

File tree

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,7 @@ ij_kotlin_while_on_new_line = false
962962
ij_kotlin_wrap_elvis_expressions = 1
963963
ij_kotlin_wrap_expression_body_functions = 0
964964
ij_kotlin_wrap_first_method_in_call_chain = false
965+
ktlint_standard_filename = disabled
965966

966967
[{*.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .stylelintrc, bowerrc, jest.config, mcmod.info}]
967968
indent_size = 2

build-logic/build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99

1010
dependencies {
1111
// loom needs this version of asm, for some reason we have an older one on the classpath without this
12-
implementation("org.ow2.asm:asm:9.4")
12+
implementation("org.ow2.asm:asm:9.5")
1313
implementation(libs.indraCommon)
1414
implementation(libs.indraPublishingSonatype)
1515
implementation(libs.gradleTestLogger)
@@ -27,6 +27,12 @@ spotless {
2727
kotlinGradle {
2828
target("*.gradle.kts", "src/*/kotlin/**.gradle.kts", "src/*/kotlin/**.kt")
2929
ktlint(libs.versions.ktlint.get())
30-
.editorConfigOverride(mapOf("ktlint_disabled_rules" to "filename"))
30+
.editorConfigOverride(
31+
mapOf(
32+
"ktlint_standard_filename" to "disabled",
33+
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
34+
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
35+
)
36+
)
3137
}
3238
}

build-logic/src/main/kotlin/cloud.kotlin-conventions.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ tasks {
4444
spotless {
4545
kotlin {
4646
ktlint(libs.versions.ktlint.get())
47-
.editorConfigOverride(mapOf("ktlint_disabled_rules" to "filename"))
47+
.editorConfigOverride(
48+
mapOf(
49+
"ktlint_standard_filename" to "disabled",
50+
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
51+
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
52+
)
53+
)
4854
}
4955
}

gradle/libs.versions.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ metadata:
44
- plugins
55

66
plugins:
7-
com.github.johnrengelman.shadow: 7.1.2
8-
com.github.ben-manes.versions: 0.44.0
9-
com.diffplug.spotless: &spotless 6.12.0
10-
xyz.jpenilla.run-paper: &run-task 2.0.0
7+
com.github.johnrengelman.shadow: 8.1.1
8+
com.github.ben-manes.versions: 0.48.0
9+
com.diffplug.spotless: &spotless 6.21.0
10+
xyz.jpenilla.run-paper: &run-task 2.1.0
1111
xyz.jpenilla.run-velocity: *run-task
1212
xyz.jpenilla.run-waterfall: *run-task
1313

1414
versions:
1515
checkstyle: 10.5.0
16-
checkerQual: 3.28.0
16+
checkerQual: 3.38.0
1717
errorprone: 2.16
18-
geantyref: 1.3.13
18+
geantyref: 1.3.14
1919
jmh: 1.36
2020
apiguardian: 1.1.2
2121

@@ -26,7 +26,7 @@ versions:
2626
kotlin: 1.7.22
2727
dokka: 1.7.20
2828
coroutines: 1.5.2
29-
ktlint: 0.47.1
29+
ktlint: 0.50.0
3030

3131
# discord
3232
javacord: 3.1.1
@@ -48,21 +48,21 @@ versions:
4848
velocityApi: 3.1.0
4949
spongeApi7: 7.3.0
5050
jetbrainsAnnotations: 23.0.0
51-
fabricMinecraft: 1.19.4-pre1
52-
fabricLoader: 0.14.14
53-
fabricApi: 0.75.0+1.19.4
51+
fabricMinecraft: 1.19.4
52+
fabricLoader: 0.14.22
53+
fabricApi: 0.87.0+1.19.4
5454
fabricPermissionsApi: 0.2-SNAPSHOT
5555

5656
# testing
57-
jupiterEngine : 5.9.1
57+
jupiterEngine : 5.10.0
5858
mockitoCore : 4.9.0
5959
mockitoKotlin : 4.1.0
6060
mockitoJupiter: 4.9.0
6161
truth : 1.1.3
6262
compileTesting: "0.20"
6363

6464
# build-logic
65-
indra: 3.0.1
65+
indra: 3.1.3
6666
gradleTestLogger: 3.2.0
6767
gradleErrorprone: 3.0.1
6868
spotless: *spotless

gradle/wrapper/gradle-wrapper.jar

2.1 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 12 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pluginManagement {
2121

2222
plugins {
2323
id("ca.stellardrift.polyglot-version-catalogs") version "6.0.1"
24-
id("quiet-fabric-loom") version "1.1-SNAPSHOT"
24+
id("quiet-fabric-loom") version "1.3-SNAPSHOT"
2525
}
2626

2727
dependencyResolutionManagement {

0 commit comments

Comments
 (0)