Skip to content

Commit ee923c0

Browse files
authored
Upgrade Gradle wrapper to 9.4.1 (#383)
1 parent 80d48ed commit ee923c0

File tree

7 files changed

+11
-16
lines changed

7 files changed

+11
-16
lines changed

buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotDependencyExtension.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ abstract class SpigotDependencyExtension(
1212
.convention(version.map {
1313
it.replace("-R\\d+\\.\\d+-SNAPSHOT".toRegex(), "")
1414
})
15-
val configuration = objects.property(String::class.java)
1615
val classifier = objects.property(String::class.java).convention("remapped-mojang")
17-
val ext = objects.property(String::class.java)
1816
val java = objects.property(JavaToolchainSpec::class.java)
1917
val ignoreCached = objects.property(Boolean::class.java).convention(false)
2018

buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotSetup.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,7 @@ abstract class SpigotSetup : Plugin<Project> {
4646

4747
// Add Spigot dependency.
4848
val dependency = target.dependencies.create(
49-
"org.spigotmc",
50-
"spigot",
51-
spigotExt.version.get(),
52-
spigotExt.configuration.orNull,
53-
spigotExt.classifier.orNull,
54-
spigotExt.ext.orNull
49+
"org.spigotmc:spigot:${spigotExt.version.get()}:${spigotExt.classifier.getOrElse("")}"
5550
)
5651
target.dependencies.add("compileOnly", dependency)
5752
}

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

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

gradlew.bat

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

plugin/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ dependencies {
2727

2828
tasks.processResources {
2929
expand(
30-
"version" to version,
31-
"sqlite" to libs.sqlite.jdbc.get().version
30+
mutableMapOf(
31+
"version" to version,
32+
"sqlite" to libs.sqlite.jdbc.get().version
33+
)
3234
)
3335
}
3436

0 commit comments

Comments
 (0)