Skip to content

Changing GSON version to 2.11 and editing some JSonParser issues issue #3 #4

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changing GSON version to 2.11 and editing some JSonParser issues issue #3 #4

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
44 changes: 37 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
<version>1.0-SNAPSHOT</version>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.release>8</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -127,11 +126,6 @@
<artifactId>adventure-platform-bukkit</artifactId>
<version>4.3.4</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bukkit</artifactId>
<version>4.3.4</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-minimessage</artifactId>
Expand All @@ -142,5 +136,41 @@
<artifactId>adventure-text-serializer-json</artifactId>
<version>4.17.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<relocations>
<relocation>
<pattern>com.google.gson</pattern>
<shadedPattern>com.pixesoj.deluxeteleport.shaded.gson</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
10 changes: 5 additions & 5 deletions src/main/java/com/pixesoj/deluxeteleport/managers/UpdateCheckManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ public UpdateCheckResult check() {
try (InputStream inputStream = connection.getInputStream();
InputStreamReader reader = new InputStreamReader(inputStream)) {

JsonObject json = JsonParser.parseReader(reader).getAsJsonObject();
JsonObject json = new JsonParser().parse(reader).getAsJsonObject();
String latestVersion = json.get("name").getAsString();
if (latestVersion.contains("-")) latestVersion = latestVersion.split("-")[0];

String downloadUrl = null;
if (json.has("assets") && !json.getAsJsonArray("assets").isEmpty()) {

if (json.has("assets") && json.getAsJsonArray("assets").size() > 0) {
JsonArray assets = json.getAsJsonArray("assets");
downloadUrl = assets.get(0).getAsJsonObject().get("browser_download_url").getAsString();
}
Expand Down Expand Up @@ -78,8 +78,8 @@ public List<String> getAvailableVersions() {
response.append(inputLine);
}
in.close();

JsonArray releases = JsonParser.parseString(response.toString()).getAsJsonArray();
JsonObject json = new JsonParser().parse(response.toString()).getAsJsonObject();
JsonArray releases = json.getAsJsonArray("releases");

for (int i = 0; i < releases.size(); i++) {
JsonObject release = releases.get(i).getAsJsonObject();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/pixesoj/deluxeteleport/subcommands/ChangelogSubCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.pixesoj.deluxeteleport.subcommands;

import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.pixesoj.deluxeteleport.DeluxeTeleport;
Expand Down Expand Up @@ -104,8 +105,7 @@ public void mainSubCommand(CommandSender sender, String[] args, boolean isNotify
response.append(inputLine);
}
in.close();

JsonObject jsonResponse = JsonParser.parseString(response.toString()).getAsJsonObject();
JsonObject jsonResponse = new JsonParser().parse(response.toString()).getAsJsonObject();
String changelogBody = jsonResponse.get("body").getAsString();

String version = jsonResponse.get("name").getAsString();
Expand Down