Skip to content

Commit 53f97f6

Browse files
zml2008ImMorpheus
authored andcommitted
build: Update dependency versions for 1.18.2
1 parent cc4bcf4 commit 53f97f6

File tree

6 files changed

+23
-15
lines changed

6 files changed

+23
-15
lines changed

build.gradle.kts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import net.ltgt.gradle.errorprone.errorprone
22

33
buildscript {
44
dependencies {
5-
classpath("fr.inria.gforge.spoon:spoon-core:9.0.0") // bump for EIG
5+
classpath("fr.inria.gforge.spoon:spoon-core:10.0.0") // bump for EIG
66
}
77
}
88

@@ -30,6 +30,8 @@ val ap by sourceSets.registering {
3030
// Project dependencies
3131
val adventureVersion: String by project
3232
val configurateVersion: String by project
33+
val gsonVersion: String by project
34+
val guavaVersion: String by project
3335
val log4jVersion: String by project
3436
val mathVersion: String by project
3537
dependencies {
@@ -41,13 +43,13 @@ dependencies {
4143

4244
// Directly tied to what's available from Minecraft
4345
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
44-
api("com.google.guava:guava:31.0.1-jre") {
46+
api("com.google.guava:guava:$guavaVersion") {
4547
exclude(group ="com.google.code.findbugs", module = "jsr305") // We don't want to use jsr305, use checkerframework
4648
exclude(group = "org.checkerframework", module = "checker-qual") // We use our own version
4749
exclude(group = "com.google.j2objc", module = "j2objc-annotations")
4850
exclude(group = "org.codehaus.mojo", module = "animal-sniffer-annotations")
4951
}
50-
api("com.google.code.gson:gson:2.8.8")
52+
api("com.google.code.gson:gson:$gsonVersion")
5153

5254
// Adventure
5355
api(platform("net.kyori:adventure-bom:$adventureVersion"))
@@ -127,7 +129,7 @@ dependencies {
127129

128130
tasks {
129131
genEventImpl {
130-
sourceCompatibility = "15"
132+
sourceCompatibility = "16"
131133
destinationDir = project.layout.buildDirectory.dir("generated/event-factory").get().asFile
132134

133135
outputFactory = "org.spongepowered.api.event.SpongeEventFactory"
@@ -173,9 +175,9 @@ tasks {
173175
links(
174176
"https://logging.apache.org/log4j/log4j-$log4jVersion/log4j-api/apidocs/",
175177
"https://google.github.io/guice/api-docs/5.0.1/javadoc/",
176-
"https://guava.dev/releases/21.0/api/docs/",
178+
"https://guava.dev/releases/$guavaVersion/api/docs/",
177179
"https://configurate.aoeu.xyz/$configurateVersion/apidocs/",
178-
"https://www.javadoc.io/doc/com.google.code.gson/gson/2.8.0/",
180+
"https://www.javadoc.io/doc/com.google.code.gson/gson/$gsonVersion/",
179181
"https://jd.spongepowered.org/math/$mathVersion"
180182
)
181183
sequenceOf("api", "key", "text-serializer-gson", "text-serializer-legacy", "text-serializer-plain").forEach {

gradle.properties

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ projectDescription=A plugin API for Minecraft: Java Edition
77
org.gradle.parallel=true
88

99
adventureVersion=4.10.0
10-
caffeineVersion=3.0.4
10+
caffeineVersion=3.0.5
1111
configurateVersion=4.1.2
1212
errorproneVersion=2.10.0
13-
junitVersion=5.8.1
14-
log4jVersion=2.14.1
13+
gsonVersion=2.8.9
14+
guavaVersion=31.0.1-jre
15+
junitVersion=5.8.2
16+
log4jVersion=2.17.0
1517
mathVersion=2.0.1
1618
mockitoVersion=4.0.0
1719
pluginSpiVersion=0.3.0

gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
3232
# Busybox and similar reduced shells will NOT work, because this script
3333
# requires all of these POSIX shell features:
3434
# * functions;
35-
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36-
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37-
# * compound commands having a testable exit status, especially «case»;
38-
# * various built-in commands including «command», «set», and «ulimit».
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
3939
#
4040
# Important for patching:
4141
#

settings.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ pluginManagement {
1717
id("net.kyori.indra.checkstyle") version indraVersion
1818
}
1919
}
20+
21+
if (JavaVersion.current() < JavaVersion.VERSION_11) {
22+
throw GradleException("SpongeAPI requires at least Java 11 to build, but you have ${JavaVersion.current()}.")
23+
}

0 commit comments

Comments
 (0)