JfMods
/
Inceptum
1
0
Fork 0
Code Issues 2 Packages Projects Releases Activity

Bump commons + gson-compile. Introduces safe writing (no more half-written config files!)
ci/woodpecker/push/docs Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2023-01-22 16:17:43 +01:00
parent dff05af62f
commit 37872e6c79
Signed by: Johannes
GPG Key ID: E76429612C2929F4
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -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"))

2
buildSrc/build.gradle.kts
View File

@ -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")
}

1
common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java
View File

@ -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;

6
launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java
View File

@ -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);
}
};
}