From acb0bd95f2439a79e93998ee385fdecf09b913dc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 23:05:56 +0000 Subject: [PATCH 1/7] Bump kotlin-stdlib from 1.3.72 to 1.4.0 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.72 to 1.4.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.72...v1.4.0) Signed-off-by: dependabot-preview[bot] --- Core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/build.gradle b/Core/build.gradle index 4d7b74e18..9416a519e 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -15,7 +15,7 @@ dependencies { testCompileOnly("org.projectlombok:lombok:1.18.8") annotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8") - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.72") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.4.0") implementation("org.jetbrains:annotations:20.0.0") implementation("org.khelekore:prtree:1.7.0-SNAPSHOT") } From 1441cc293caf6e63c74dead3cbce79e2f97d81b4 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Wed, 26 Aug 2020 13:57:20 +0200 Subject: [PATCH 2/7] 5.13.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f1dffa700..4a6f9293a 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ ext { git = Grgit.open(dir: new File(rootDir.toString() + "/.git")) } -def ver = "5.13.2" +def ver = "5.13.3" def versuffix = "" ext { if (project.hasProperty("versionsuffix")) { From 97e34844b441926da91e2551e7c0865e1ad38345 Mon Sep 17 00:00:00 2001 From: N0tMyFaultOG Date: Wed, 2 Sep 2020 12:13:23 +0200 Subject: [PATCH 3/7] Add option to opt-out MvDW Placeholder API --- Bukkit/pom.xml | 2 +- .../plotsquared/bukkit/listener/ServerListener.java | 3 ++- Core/pom.xml | 12 ++++++------ .../com/plotsquared/core/configuration/Settings.java | 4 +++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index 4119b792b..ef3ad830a 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -21,7 +21,7 @@ com.plotsquared PlotSquared-Core - 5.13.2 + 5.13.3 compile diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java index c74db87d4..60842c2d9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java @@ -29,6 +29,7 @@ import com.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.placeholder.MVdWPlaceholders; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -43,7 +44,7 @@ public class ServerListener implements Listener { } @EventHandler public void onServerLoad(ServerLoadEvent event) { - if (Bukkit.getPluginManager().getPlugin("MVdWPlaceholderAPI") != null) { + if (Bukkit.getPluginManager().getPlugin("MVdWPlaceholderAPI") != null && Settings.Enabled_Components.USE_MVDWAPI) { new MVdWPlaceholders(this.plugin, PlotSquared.get().getPlaceholderRegistry()); PlotSquared.log(Captions.PREFIX + "&6PlotSquared hooked into MVdWPlaceholderAPI"); } diff --git a/Core/pom.xml b/Core/pom.xml index d69f10a99..ad175038f 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -18,12 +18,6 @@ 1.18.12 runtime - - org.jetbrains - annotations - 19.0.0 - runtime - com.sk89q.worldedit worldedit-core @@ -92,6 +86,12 @@ 1.3.72 runtime + + org.jetbrains + annotations + 20.0.0 + runtime + org.khelekore prtree diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java index e2fdfde60..81ac560bf 100644 --- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java +++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java @@ -582,7 +582,7 @@ public class Settings extends Config { @Comment("Actively purge invalid database entries") public static boolean DATABASE_PURGER = false; @Comment({"Delete plots when a player is banned.", - "Note: This only works with the /minecraft:ban command. Any punishment plugin like LiteBans is not supported."}) public static boolean BAN_DELETER = false; + "Note: This only works with the /minecraft:ban command. Any punishment plugin is not supported."}) public static boolean BAN_DELETER = false; @Comment("Allows PlaceholderAPI placeholders to be used in captions, flags, etc.") public static boolean EXTERNAL_PLACEHOLDERS = true; @Comment("Make road regeneration persistent across restarts") public static boolean @@ -593,6 +593,8 @@ public class Settings extends Config { public static boolean EXTENDED_USERNAME_COMPLETION = true; @Comment("Command aliases that will be tab completed") public static List TAB_COMPLETED_ALIASES = Arrays.asList("plot", "plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"); + @Comment("Whether PlotSquared should hook into MvDWPlaceholderAPI or not") + public static boolean USE_MVDWAPI = true; } } From 49984f2560b64fbb9b49eb4f4a3d8e13e33097f5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 13:55:15 +0000 Subject: [PATCH 4/7] Create Dependabot config file --- .github/dependabot.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..3fe9883e9 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,32 @@ +version: 2 +updates: +- package-ecosystem: gradle + directory: "/" + schedule: + interval: weekly + open-pull-requests-limit: 10 + target-branch: v5 + ignore: + - dependency-name: com.google.guava:guava + versions: + - ">= 22.a" + - "< 23" + - dependency-name: com.google.guava:guava + versions: + - ">= 23.a" + - "< 24" + - dependency-name: com.squareup.okhttp3:okhttp + versions: + - "> 4.2.2" + - dependency-name: com.squareup.okio:okio + versions: + - "> 2.4.1" + - "< 3" + - dependency-name: com.squareup.retrofit2:retrofit + versions: + - "> 2.4.0" + - "< 3" + - dependency-name: net.kyori:text-adapter-bukkit + versions: + - "> 3.0.3" + - "< 3.1" From 20b4cec0ca5f6a7a847d8b86f2bd38fb569c0974 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 14:10:39 +0000 Subject: [PATCH 5/7] Bump org.ajoberstar.grgit from 4.0.1 to 4.0.2 Bumps org.ajoberstar.grgit from 4.0.1 to 4.0.2. Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4a6f9293a..056b8d5aa 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { plugins { id "maven-publish" - id "org.ajoberstar.grgit" version "4.0.1" + id "org.ajoberstar.grgit" version "4.0.2" } group = "com.plotsquared" From 32a8dcd411694efaf2b0a0dc49c97467598b6ac5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 14:10:44 +0000 Subject: [PATCH 6/7] Bump annotations from 20.0.0 to 20.1.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0) Signed-off-by: dependabot[bot] --- Core/build.gradle | 2 +- build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/build.gradle b/Core/build.gradle index 9416a519e..0396477b7 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -16,7 +16,7 @@ dependencies { annotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.4.0") - implementation("org.jetbrains:annotations:20.0.0") + implementation("org.jetbrains:annotations:20.1.0") implementation("org.khelekore:prtree:1.7.0-SNAPSHOT") } diff --git a/build.gradle b/build.gradle index 4a6f9293a..d47bedb06 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { configurations.all { resolutionStrategy { force("org.ow2.asm:asm:8.0.1") - force("org.jetbrains:annotations:20.0.0") + force("org.jetbrains:annotations:20.1.0") } } } @@ -94,7 +94,7 @@ subprojects { implementation("com.google.guava:guava:21.0") { because("Minecraft uses Guava 21 as of 1.13") } - compileOnly("org.jetbrains:annotations:19.0.0") + compileOnly("org.jetbrains:annotations:20.1.0") compileClasspath("org.projectlombok:lombok:1.18.12") testCompileOnly("org.projectlombok:lombok:1.18.12") annotationProcessor("org.projectlombok:lombok:1.18.8") @@ -106,7 +106,7 @@ subprojects { resolutionStrategy { force("junit:junit:4.12") force("com.google.guava:guava:21.0") - force("org.jetbrains:annotations:20.0.0") + force("org.jetbrains:annotations:20.1.0") force("com.google.code.findbugs:jsr305:3.0.2") } } From 7c53bfc870dc21fc71eb15fbc5bd55483516c544 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 14:10:44 +0000 Subject: [PATCH 7/7] Bump snakeyaml from 1.25 to 1.26 Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.25 to 1.26. - [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.26..snakeyaml-1.25) Signed-off-by: dependabot[bot] --- Core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/build.gradle b/Core/build.gradle index 9416a519e..8ac5d41f7 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -5,7 +5,7 @@ repositories { def textVersion = "3.0.2" dependencies { - implementation("org.yaml:snakeyaml:1.25") + implementation("org.yaml:snakeyaml:1.26") implementation("com.google.code.gson:gson:2.8.6") { because("Minecraft uses GSON 2.8.0") force = true