Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use server provided gson instead of shading our own #5347

Merged
merged 1 commit into from
Oct 8, 2021
Merged

Use server provided gson instead of shading our own #5347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,6 @@
<version>5.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
</dependency>
<dependency>
<groupId>com.github.bsideup.jabel</groupId>
<artifactId>jabel-javac-plugin</artifactId>
Expand Down
9 changes: 3 additions & 6 deletions src/com/palmergames/bukkit/towny/tasks/UpdateCheckerTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.palmergames.bukkit.towny.tasks;

import com.google.gson.JsonParser;
import com.palmergames.bukkit.towny.Towny;
import com.palmergames.bukkit.towny.TownyUpdateChecker;
import com.palmergames.bukkit.towny.object.Translation;
import com.palmergames.bukkit.util.Version;
import net.md_5.bungee.api.ChatColor;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONTokener;

import java.io.BufferedReader;
import java.io.IOException;
Expand All @@ -34,8 +32,7 @@ public void run() {

try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
try {
JSONArray results = new JSONArray(new JSONTokener(reader));
Version latestVersion = Version.fromString(results.getJSONObject(0).getString("tag_name"));
Version latestVersion = Version.fromString(new JsonParser().parse(reader).getAsJsonArray().get(0).getAsJsonObject().get("tag_name").getAsString());
boolean upToDate = Version.fromString(towny.getVersion()).compareTo(latestVersion) >= 0;

if (!upToDate) {
Expand All @@ -48,7 +45,7 @@ public void run() {
towny.getLogger().info(Translation.of("msg_no_new_updates"));
TownyUpdateChecker.setCheckedSuccessfully(true);
}
} catch (JSONException ignored) {}
} catch (Exception ignored) {}
}
} catch (IOException e) {
towny.getLogger().info(Translation.of("msg_no_new_updates"));
Expand Down