Skip to content

Commit 494cbfc

Browse files
committed
Migrate from paper api to folia for folia schedulers support;
1 parent 1d3fbd8 commit 494cbfc

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

worldguard-bukkit/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,22 @@ configurations {
2020

2121
dependencies {
2222
"api"(project(":worldguard-core"))
23+
<<<<<<< HEAD
2324
<<<<<<< HEAD
2425
"compileOnly"("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")
2526
"runtimeOnly"("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") {
2627
=======
2728
"compileOnly"("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
2829
"runtimeOnly"("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT") {
2930
>>>>>>> 16887c85 (deps: Update Paper to 1.20, snakeyml to 2.0)
31+
=======
32+
"compileOnly"("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
33+
"runtimeOnly"("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT") {
34+
=======
35+
"compileOnly"("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")
36+
"runtimeOnly"("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") {
37+
>>>>>>> f7a59dda (Migrate from paper api to folia for folia schedulers support;)
38+
>>>>>>> 1dbe2914 (Migrate from paper api to folia for folia schedulers support;)
3039
exclude("junit", "junit")
3140
}
3241
"api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }

0 commit comments

Comments
 (0)