Skip to content

Commit 6a384fe

Browse files
committed
Merge branch 'api-8' into api-9
2 parents 5932d4d + 8727c7a commit 6a384fe

File tree

6 files changed

+57
-77
lines changed

6 files changed

+57
-77
lines changed

build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ val mathVersion: String by project
3535
dependencies {
3636
val caffeineVersion: String by project
3737
val errorproneVersion: String by project
38+
val junitVersion: String by project
39+
val mockitoVersion: String by project
3840
val pluginSpiVersion: String by project
3941

4042
// Directly tied to what's available from Minecraft
@@ -117,12 +119,12 @@ dependencies {
117119
// Math library
118120
api("org.spongepowered:math:$mathVersion")
119121

120-
testImplementation(platform("org.junit:junit-bom:5.7.2"))
122+
testImplementation(platform("org.junit:junit-bom:$junitVersion"))
121123
testImplementation("org.junit.jupiter:junit-jupiter-api")
122124
testImplementation("org.junit.jupiter:junit-jupiter-params")
123125
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
124126
testImplementation("org.hamcrest:hamcrest:2.2")
125-
testImplementation("org.mockito:mockito-core:3.10.0")
127+
testImplementation("org.mockito:mockito-core:$mockitoVersion")
126128
}
127129

128130
tasks {

gradle.properties

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ projectDescription=A plugin API for Minecraft: Java Edition
66

77
org.gradle.parallel=true
88

9-
adventureVersion=4.9.2
10-
caffeineVersion=3.0.2
9+
adventureVersion=4.9.3
10+
caffeineVersion=3.0.4
1111
configurateVersion=4.1.2
12-
errorproneVersion=2.8.1
12+
errorproneVersion=2.10.0
13+
junitVersion=5.8.1
1314
log4jVersion=2.14.1
1415
mathVersion=2.0.1
16+
mockitoVersion=4.0.0
1517
pluginSpiVersion=0.3.0

src/main/java/org/spongepowered/api/item/inventory/InventoryArchetypes.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)