Migrate from paper api to folia for folia schedulers support;

EngineHub · Jul 6, 2023 · 494cbfc · 494cbfc
1 parent 1d3fbd8
commit 494cbfc
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/worldguard-bukkit/build.gradle.kts b/worldguard-bukkit/build.gradle.kts
@@ -20,13 +20,22 @@ configurations {
 
 dependencies {
     "api"(project(":worldguard-core"))
+<<<<<<< HEAD
 <<<<<<< HEAD
     "compileOnly"("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")
     "runtimeOnly"("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") {
 =======
     "compileOnly"("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
     "runtimeOnly"("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT") {
 >>>>>>> 16887c85 (deps: Update Paper to 1.20, snakeyml to 2.0)
+=======
+    "compileOnly"("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
+    "runtimeOnly"("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT") {
+=======
+    "compileOnly"("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")
+    "runtimeOnly"("org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT") {
+>>>>>>> f7a59dda (Migrate from paper api to folia for folia schedulers support;)
+>>>>>>> 1dbe2914 (Migrate from paper api to folia for folia schedulers support;)
         exclude("junit", "junit")
     }
     "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }