RC 4. Bugfix

minecraft8997 · Jan 10, 2023 · 65c8cf1 · 65c8cf1
1 parent 64941ae
commit 65c8cf1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,10 @@
 plugins {
     id 'java'
-    id 'application'
 }
 
+group = 'ru.deewend.banallbot'
 version = '2.0.0'
 
-application {
-    mainClass = 'ru.deewend.banallbot.Main'
-}
-
 repositories {
     mavenCentral()
     maven {
@@ -25,6 +21,19 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 }
 
+jar {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+
+    //noinspection GroovyAssignabilityCheck
+    manifest {
+        attributes('Main-Class': 'ru.deewend.banallbot.Main')
+    }
+
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+}
+
 task(runMain, dependsOn: 'classes', type: JavaExec) {
     //noinspection GrDeprecatedAPIUsage
     main = 'ru.deewend.banallbot.Main'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
diff --git a/src/main/java/ru/deewend/banallbot/Helper.java b/src/main/java/ru/deewend/banallbot/Helper.java
@@ -36,7 +36,6 @@ public static boolean sleep(long millis) {
 
             return true;
         } catch (InterruptedException e) {
-            e.printStackTrace();
             Thread.currentThread().interrupt();
 
             return false;

diff --git a/src/main/java/ru/deewend/banallbot/Main.java b/src/main/java/ru/deewend/banallbot/Main.java
@@ -121,6 +121,7 @@ public static void main(String[] args) throws Exception {
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             Database.getInstance().interruptHelperThread();
+            System.out.println("Saving database...");
             try {
                 Database.getInstance().save();
             } catch (IOException e) {

diff --git a/src/main/java/ru/deewend/banallbot/database/Database.java b/src/main/java/ru/deewend/banallbot/database/Database.java
@@ -33,6 +33,7 @@ public static Database getInstance() {
             //noinspection ResultOfMethodCallIgnored
             DB_FILE.createNewFile();
             dataMap = new HashMap<>();
+            unsavedChanges = true;
 
             return;
         }
@@ -59,9 +60,9 @@ public void startHelperThread() {
         if (helperThread != null) throw new IllegalStateException();
 
         helperThread = new Thread(() -> {
-            while (true) {
+            global: while (true) {
                 for (int i = 0; i < 3; i++) {
-                    if (!Helper.sleep(3600 * 1000)) break; // 1 hour
+                    if (!Helper.sleep(3600 * 1000)) break global; // 1 hour
 
                     refreshLeaderboards(false);
                 }