From ab2266b26d95537ae35ec5f202af1053d4ca8b6a Mon Sep 17 00:00:00 2001 From: Damien Vergnet Date: Wed, 30 Aug 2017 18:20:50 +0200 Subject: [PATCH] libs: switched to GUI-Framework 1.4 --- .classpath | 2 +- build.gradle | 2 +- ...mework-1.3.1.jar => GUI-Framework-1.4.jar} | Bin 130457 -> 130975 bytes .../darmo_creations/minesweeper/Start.java | 5 +++-- 4 files changed, 5 insertions(+), 4 deletions(-) rename libs/{GUI-Framework-1.3.1.jar => GUI-Framework-1.4.jar} (92%) diff --git a/.classpath b/.classpath index b49a317..6d60104 100644 --- a/.classpath +++ b/.classpath @@ -13,6 +13,6 @@ - + diff --git a/build.gradle b/build.gradle index e71ff6f..6cf3b02 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ dependencies { // The production code uses the SLF4J logging API at compile time compile 'org.slf4j:slf4j-api:1.7.21' // GUI-Framework - compile files('libs/GUI-Framework-1.3.1.jar') + compile files('libs/GUI-Framework-1.4.jar') // JUnit testCompile 'junit:junit:4.12' } diff --git a/libs/GUI-Framework-1.3.1.jar b/libs/GUI-Framework-1.4.jar similarity index 92% rename from libs/GUI-Framework-1.3.1.jar rename to libs/GUI-Framework-1.4.jar index 842106eadbde7f332d558b078192ecc6e3e20565..ee6b51f8c4bf59af87d0f30c82f1cf0338a3fef9 100644 GIT binary patch delta 5617 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 diff --git a/src/main/java/net/darmo_creations/minesweeper/Start.java b/src/main/java/net/darmo_creations/minesweeper/Start.java index 34113db..4a4a621 100644 --- a/src/main/java/net/darmo_creations/minesweeper/Start.java +++ b/src/main/java/net/darmo_creations/minesweeper/Start.java @@ -23,6 +23,7 @@ import java.util.Locale; import net.darmo_creations.gui_framework.ApplicationRegistry; +import net.darmo_creations.gui_framework.GuiFramework; import net.darmo_creations.gui_framework.config.Language; public class Start { @@ -33,7 +34,7 @@ public static void main(String[] args) { l.add(new Language("Esperanto", new Locale("eo"))); ApplicationRegistry.setLanguages(l); - ApplicationRegistry.registerApplication(new Minesweeper()); - net.darmo_creations.gui_framework.Start.run(); + ApplicationRegistry.registerApplication(Minesweeper.class); + GuiFramework.run(); } }