diff --git a/build.gradle.kts b/build.gradle.kts index 9a2fcf3..0fb67f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { java - id("com.github.johnrengelman.shadow") version "6.1.0" + id("com.github.johnrengelman.shadow") version "7.0.0" `maven-publish` } @@ -26,12 +26,12 @@ repositories { } dependencies { - implementation("net.dv8tion:JDA:4.2.1_260") + implementation("net.dv8tion:JDA:4.2.1_264") implementation("com.mrivanplays:JDCF:1.0.6-SNAPSHOT") - implementation("com.github.ben-manes.caffeine:caffeine:3.0.1") + implementation("com.github.ben-manes.caffeine:caffeine:3.0.2") implementation("org.apache.commons:commons-text:1.9") - implementation("org.slf4j:slf4j-simple:1.7.25") - implementation("org.apache.httpcomponents.client5:httpclient5:5.1-beta1") + implementation("org.slf4j:slf4j-simple:2.0.0-alpha1") + implementation("org.apache.httpcomponents.client5:httpclient5:5.1") implementation("com.google.code.gson:gson:2.8.6") implementation("com.google.guava:guava:30.1.1-jre") testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.0-M1") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 28ff446..c5d7d36 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +# Check on https://gradle.org/release-checksums/ +distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/src/main/java/org/yatopiamc/bot/commands/CommandJDKSpecific.java b/src/main/java/org/yatopiamc/bot/commands/CommandJDKSpecific.java index 685d788..99d0764 100644 --- a/src/main/java/org/yatopiamc/bot/commands/CommandJDKSpecific.java +++ b/src/main/java/org/yatopiamc/bot/commands/CommandJDKSpecific.java @@ -22,7 +22,7 @@ public boolean execute(@NotNull CommandExecutionContext context, @NotNull Comman switch (alias) { case "jdk": String descriptionJdk = - "Our advice on JDK is to use the latest LTS (Long Term Support) version, currently JDK 11"; + "Our advice on JDK is to use the latest version, currently JDK 16"; channel .sendMessage( EmbedUtil.withAuthor(context.getAuthor()).setDescription(descriptionJdk).build()) diff --git a/src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java b/src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java index a388eac..19fbe3f 100644 --- a/src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java +++ b/src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java @@ -231,8 +231,8 @@ private void checkJvmFlags(EmbedBuilder embedBuilder, JsonObject system) { final String jvmFlags = system.get("flags").getAsString(); if (jvmFlags.contains("-XX:+UseZGC")) { final String jvmVersion = system.get("jvmversion").getAsString(); - if (Integer.parseInt(jvmVersion.split("\\.")[0]) < 14) - embedBuilder.addField("Java version & ZGC", "If you are going to use ZGC, you should also use Java 15 or later.", true); + if (Integer.parseInt(jvmVersion.split("\\.")[0]) < 16) + embedBuilder.addField("Java version & ZGC", "If you are going to use ZGC, you should also use Java 16 or later.", true); if (jvmFlags.contains("-Xmx")) { int maxMem = 0; String xmxString = jvmFlags.substring(jvmFlags.indexOf("-Xmx")); @@ -288,8 +288,8 @@ private long parseMemory(String str) { private void checkJvmVersion(EmbedBuilder embedBuilder, JsonObject system) { final String jvmVersion = system.get("jvmversion").getAsString(); - if (jvmVersion.startsWith("1.8.") || jvmVersion.startsWith("9.") || jvmVersion.startsWith("10.")) - embedBuilder.addField("Java version", String.format("You are using Java %s. Update to [Java 11](https://adoptopenjdk.net/installation.html).", jvmVersion), true); + if (jvmVersion.startsWith("1.8.") || jvmVersion.startsWith("9.") || jvmVersion.startsWith("10.") || jvmVersion.startsWith("11.") || jvmVersion.startsWith("12.") || jvmVersion.startsWith("13.") || jvmVersion.startsWith("14.") || jvmVersion.startsWith("15.")) + embedBuilder.addField("Java version", String.format("You are using Java %s. Update to [Java 16](https://adoptopenjdk.net/installation.html).", jvmVersion), true); } private void checkTimingCost(EmbedBuilder embedBuilder, JsonObject system) {