From 806867120071e2bdcd2436ba49a7360259f33c23 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 15:16:54 +0000 Subject: [PATCH 1/8] Bump kotlin-stdlib from 1.3.30 to 1.3.50 Bumps [kotlin-stdlib](https://github.com/JetBrains/kotlin) from 1.3.30 to 1.3.50. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.50/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.30...v1.3.50) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index de4ca4e9b..94241b507 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -51,7 +51,7 @@ shadowJar { include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) include(dependency("com.squareup.okio:okio:2.2.2")) - include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.30")) + include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) include(dependency("io.papermc:paperlib:1.0.2")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) } diff --git a/Core/build.gradle b/Core/build.gradle index 90a33b8d2..2a6a0b7cf 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") implementation("com.squareup.okhttp3:okhttp:3.14.0") implementation("com.squareup.okio:okio:2.2.2") - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.30") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50") } sourceCompatibility = 1.8 From 599ef8aa44615f427e031b50968b894fa4ca2a1d Mon Sep 17 00:00:00 2001 From: mindw0rm Date: Thu, 10 Oct 2019 01:33:37 +0200 Subject: [PATCH 2/8] Bugfix for #2524 (place flag) --- .../plotsquared/bukkit/listeners/PlayerEvents.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java index f2e8f363a..f5856ed4d 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java @@ -2046,6 +2046,7 @@ import java.util.regex.Pattern; location = BukkitUtil .getLocation(block.getRelative(event.getBlockFace()).getLocation()); eventType = PlayerBlockEventType.PLACE_BLOCK; + lb = new BukkitLazyBlock(new StringPlotBlock(type.toString())); break; } lb = new BukkitLazyBlock(PlotBlock.get(type.toString())); From 1f4f78a1793b3ee8a4ecc0b6e281af55b91c8c31 Mon Sep 17 00:00:00 2001 From: mindw0rm Date: Thu, 10 Oct 2019 01:53:27 +0200 Subject: [PATCH 3/8] this can be done more elegantly --- .../plotsquared/bukkit/listeners/PlayerEvents.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java index f5856ed4d..d02159dd9 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java @@ -2042,14 +2042,14 @@ import java.util.regex.Pattern; if (type == Material.AIR) { type = offType; } + // in the following, lb needs to have the material of the item in hand i.e. type + lb = new BukkitLazyBlock(PlotBlock.get(type.toString())); if (type.isBlock()) { location = BukkitUtil .getLocation(block.getRelative(event.getBlockFace()).getLocation()); eventType = PlayerBlockEventType.PLACE_BLOCK; - lb = new BukkitLazyBlock(new StringPlotBlock(type.toString())); break; } - lb = new BukkitLazyBlock(PlotBlock.get(type.toString())); if (type.toString().toLowerCase().endsWith("egg")) { eventType = PlayerBlockEventType.SPAWN_MOB; } else { From 53e94cc0018837715cc0d62a9563a95ea41458a7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 15:17:37 +0000 Subject: [PATCH 4/8] Bump gson from 2.8.0 to 2.8.6 Bumps [gson](https://github.com/google/gson) from 2.8.0 to 2.8.6. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.0...gson-parent-2.8.6) 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 2b0f40e2d..c1db0bf22 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -5,7 +5,7 @@ def textVersion = "3.0.2" dependencies { implementation("org.yaml:snakeyaml:1.25") - implementation("com.google.code.gson:gson:2.8.0") { + implementation("com.google.code.gson:gson:2.8.6") { because("Minecraft uses GSON 2.8.0") force = true } From 4a3c0155244031ca365f21d7f26c1604528d98a3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 15:17:55 +0000 Subject: [PATCH 5/8] Bump asm from 7.1 to 7.2 Bumps asm from 7.1 to 7.2. Signed-off-by: dependabot-preview[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 54dd1bd80..667ba16f8 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } configurations.all { resolutionStrategy { - force("org.ow2.asm:asm:7.1") + force("org.ow2.asm:asm:7.2") force("org.jetbrains:annotations:17.0.0") } } From 427cf081e3cfc3e5c3a42a69b0ff90711fae2182 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 21:37:55 +0000 Subject: [PATCH 6/8] Bump okio from 2.2.2 to 2.4.1 Bumps [okio](https://github.com/square/okio) from 2.2.2 to 2.4.1. - [Release notes](https://github.com/square/okio/releases) - [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okio/compare/2.2.2...2.4.1) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 94241b507..d30483859 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -50,7 +50,7 @@ shadowJar { include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) - include(dependency("com.squareup.okio:okio:2.2.2")) + include(dependency("com.squareup.okio:okio:2.4.1")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) include(dependency("io.papermc:paperlib:1.0.2")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) diff --git a/Core/build.gradle b/Core/build.gradle index 8f84c938e..c460b60df 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -16,7 +16,7 @@ dependencies { testAnnotationProcessor("org.projectlombok:lombok:1.18.8") implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") implementation("com.squareup.okhttp3:okhttp:3.14.0") - implementation("com.squareup.okio:okio:2.2.2") + implementation("com.squareup.okio:okio:2.4.1") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50") } From e029cc3fa10d8ba2ddc6b55506d00be279a5a05a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 21:40:43 +0000 Subject: [PATCH 7/8] Bump retrofit from 2.4.0 to 2.6.2 Bumps [retrofit](https://github.com/square/retrofit) from 2.4.0 to 2.6.2. - [Release notes](https://github.com/square/retrofit/releases) - [Changelog](https://github.com/square/retrofit/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/retrofit/commits) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index d30483859..d8e52d3be 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -48,7 +48,7 @@ shadowJar { include(dependency(":Core")) // update notification stuff include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) - include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) + include(dependency("com.squareup.retrofit2:retrofit:2.6.2")) include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) include(dependency("com.squareup.okio:okio:2.4.1")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) From d7d9b1793f63bd96f731f301b5b376fa945a278b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 21:40:45 +0000 Subject: [PATCH 8/8] Bump okhttp from 3.14.0 to 4.2.2 Bumps [okhttp](https://github.com/square/okhttp) from 3.14.0 to 4.2.2. - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-3.14.0...parent-4.2.2) Signed-off-by: dependabot-preview[bot] --- Bukkit/build.gradle | 2 +- Core/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index d30483859..8faad8e43 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -49,7 +49,7 @@ shadowJar { // update notification stuff include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT")) include(dependency("com.squareup.retrofit2:retrofit:2.4.0")) - include(dependency("com.squareup.okhttp3:okhttp:3.14.0")) + include(dependency("com.squareup.okhttp3:okhttp:4.2.2")) include(dependency("com.squareup.okio:okio:2.4.1")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50")) include(dependency("io.papermc:paperlib:1.0.2")) diff --git a/Core/build.gradle b/Core/build.gradle index c460b60df..1ba0b5505 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -15,7 +15,7 @@ dependencies { annotationProcessor("org.projectlombok:lombok:1.18.8") testAnnotationProcessor("org.projectlombok:lombok:1.18.8") implementation("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT") - implementation("com.squareup.okhttp3:okhttp:3.14.0") + implementation("com.squareup.okhttp3:okhttp:4.2.2") implementation("com.squareup.okio:okio:2.4.1") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.50") }