diff --git a/build.gradle b/build.gradle index 1fa6834..16af243 100755 --- a/build.gradle +++ b/build.gradle @@ -1,39 +1,39 @@ plugins { id'application' - id'com.github.johnrengelman.shadow' version '4.0.4' + id'com.github.johnrengelman.shadow' version '7.1.2' } -version '0.10' +application.mainClass = "core.Main" +group 'de.ocame' +version '0.20' + +repositories { + mavenCentral() +} //def jdaVersion = '3.8.3_460' -def jdaVersion = '5.0.0-alpha.20' +def jdaVersion = '5.2.3' apply plugin: 'java' -sourceCompatibility = 1.8 +sourceCompatibility = '17' +targetCompatibility = '17' -mainClassName = 'core.Main' - - -repositories { - jcenter() - // Required for OkHTTP 3.13.0-SNAPSHOT - maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' } dependencies { - compile "net.dv8tion:JDA:$jdaVersion" - compile "org.slf4j:slf4j-simple:1.7.36" - compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.6' - compile "org.json:json:20141113" + // compile "org.slf4j:slf4j-simple:1.7.36" + + + implementation "net.dv8tion:JDA:$jdaVersion" + implementation 'org.jsoup:jsoup:1.15.3' + implementation 'org.json:json:20231013' + implementation 'com.mysql:mysql-connector-j:9.2.0' + + implementation "ch.qos.logback:logback-classic:1.5.6" } -repositories { - jcenter() -} - -compileJava.options.encoding = 'UTF-8' - -//mainClassName = 'core.Main' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d0b7916..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Thu Nov 29 23:00:22 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 581d235..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'DiscordBot' - diff --git a/src/main/java/Simpleroll/dice.java b/src/main/java/Simpleroll/dice.java index af40f77..671d276 100644 --- a/src/main/java/Simpleroll/dice.java +++ b/src/main/java/Simpleroll/dice.java @@ -138,7 +138,7 @@ public class dice extends ListenerAdapter { event.getChannel().sendMessageEmbeds(outputBox.build()).queue(); - System.runFinalization(); + //System.runFinalization(); System.gc(); } diff --git a/src/main/java/core/Main.java b/src/main/java/core/Main.java index e67043e..c39acbc 100755 --- a/src/main/java/core/Main.java +++ b/src/main/java/core/Main.java @@ -13,9 +13,9 @@ public class Main { public static void main(String[] args) { // Insert your bot's token here - String token = "NTQ2ODk5MzYwMDEzODc3MjU4.D0u8wA.VfA2vJzundVhCl1-ibDiBaKuA8w"; + //String token = "NTQ2ODk5MzYwMDEzODc3MjU4.D0u8wA.VfA2vJzundVhCl1-ibDiBaKuA8w"; // iro - //String token = "NTQ2NzEwODUwOTIxMjk5OTc5.D0sL6A.1fUd5iBr3eo2tbPXofEqyumDm6w"; + String token = "NTQ2NzEwODUwOTIxMjk5OTc5.D0sL6A.1fUd5iBr3eo2tbPXofEqyumDm6w"; JDA jda = JDABuilder.createDefault(token) .enableIntents(GatewayIntent.MESSAGE_CONTENT) diff --git a/src/main/java/core/config.java b/src/main/java/core/config.java index f7f6e85..3cbcac8 100755 --- a/src/main/java/core/config.java +++ b/src/main/java/core/config.java @@ -3,7 +3,7 @@ package core; import java.io.*; import java.util.Properties; -public class Config { +public class config { public String token; public String GameWatching = "Den NinjaSäuen zu";