From 37872e6c796aa6e3fdd35d7343ffc2c82aa3253e Mon Sep 17 00:00:00 2001 From: JFronny Date: Sun, 22 Jan 2023 16:17:43 +0100 Subject: [PATCH] Bump commons + gson-compile. Introduces safe writing (no more half-written config files!) --- build.gradle.kts | 4 ++-- buildSrc/build.gradle.kts | 2 +- .../io/gitlab/jfronny/inceptum/common/InceptumConfig.java | 1 - .../java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7586e7b..f14d085 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,8 +11,8 @@ allprojects { val lwjglVersion by extra("3.3.1") val imguiVersion by extra("1.86.4") -val jfCommonsVersion by extra("1.0-SNAPSHOT") -val gsonCompileVersion by extra("1.2-SNAPSHOT") +val jfCommonsVersion by extra("1.1-SNAPSHOT") +val gsonCompileVersion by extra("1.3-SNAPSHOT") val jlhttpVersion by extra("2.6") val flavorProp: String by extra(prop("flavor", "custom")) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 04e578b..fbd16f5 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,5 +10,5 @@ repositories { dependencies { implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2") implementation("de.undercouch:gradle-download-task:5.1.2") - implementation("io.gitlab.jfronny:convention:1.2-SNAPSHOT") + implementation("io.gitlab.jfronny:convention:1.3-SNAPSHOT") } \ No newline at end of file diff --git a/common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java b/common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java index bb983d1..3b5acc5 100644 --- a/common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java +++ b/common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java @@ -3,7 +3,6 @@ package io.gitlab.jfronny.inceptum.common; import gsoncompile.extensions.io.gitlab.jfronny.inceptum.common.InceptumConfig.GC_InceptumConfig; import io.gitlab.jfronny.gson.compile.annotations.GComment; import io.gitlab.jfronny.gson.compile.annotations.GSerializable; -import io.gitlab.jfronny.gson.stream.*; import io.gitlab.jfronny.inceptum.common.model.inceptum.UpdateChannel; import java.io.IOException; diff --git a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java index f42edd1..5b93817 100644 --- a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java +++ b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java @@ -76,8 +76,8 @@ public enum GtkEnvBackend implements LauncherEnv.EnvBackend { //TODO test } private Dialog.Response processResponses(Dialog dialog, @Nullable Runnable ok, @Nullable Runnable cancel) { - return response_id -> { - switch (ResponseType.of(response_id)) { + return responseId -> { + switch (ResponseType.of(responseId)) { case OK -> { dialog.close(); if (ok != null) ok.run(); @@ -87,7 +87,7 @@ public enum GtkEnvBackend implements LauncherEnv.EnvBackend { //TODO test if (cancel != null) cancel.run(); } case DELETE_EVENT -> dialog.destroy(); - default -> Utils.LOGGER.error("Unexpected response type: " + response_id); + default -> Utils.LOGGER.error("Unexpected response type: " + responseId); } }; }