From 9bbc72889666491c27b480c6419bb7403ad3dab2 Mon Sep 17 00:00:00 2001 From: jamie Date: Sun, 30 Jun 2024 07:15:19 -0400 Subject: [PATCH 1/2] fix breaking change inherited by newer nanoVG version; loadFontMem accepts boolean value instead of int --- src/main/java/lwjgui/scene/Context.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/lwjgui/scene/Context.java b/src/main/java/lwjgui/scene/Context.java index 0d256c5..c4241cf 100644 --- a/src/main/java/lwjgui/scene/Context.java +++ b/src/main/java/lwjgui/scene/Context.java @@ -458,7 +458,7 @@ private void loadFont(String fontName, ByteBuffer fontData, boolean loadFallback int fontCallback; try { // Create normal font - fontCallback = NanoVG.nvgCreateFontMem(nvgContext, fontName, fontData, 0); + fontCallback = NanoVG.nvgCreateFontMem(nvgContext, fontName, fontData, false); fontBuffers.add(fontData); // Fallback emoji fonts @@ -475,7 +475,7 @@ private void loadFont(String fontName, ByteBuffer fontData, boolean loadFallback } private void addFallback(int fontCallback, String name, ByteBuffer fontData) { - NanoVG.nvgAddFallbackFontId(nvgContext, fontCallback, NanoVG.nvgCreateFontMem(nvgContext, name, fontData, 0)); + NanoVG.nvgAddFallbackFontId(nvgContext, fontCallback, NanoVG.nvgCreateFontMem(nvgContext, name, fontData, false)); } private static InputStream inputStream(String path) throws IOException { From c41f5ba217c22210e051022d8d4bfe2f3f98e218 Mon Sep 17 00:00:00 2001 From: jamie Date: Sun, 30 Jun 2024 07:32:40 -0400 Subject: [PATCH 2/2] modernize lwjgl3 version to 3.3, joml version to 1.10.6, and gradle version to 8.3 --- build.gradle | 7 +++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6779f76..ce9e157 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ plugins { } sourceCompatibility = "8" -project.ext.lwjglVersion = "3.2.3" -project.ext.jomlVersion = "1.9.20" +project.ext.lwjglVersion = "3.3.3" +project.ext.jomlVersion = "1.10.6" group = "org.lwjgui" version = "1.0.0-SNAPSHOT" @@ -103,6 +103,9 @@ dependencies { api "org.joml:joml:${jomlVersion}" } +tasks.withType(ProcessResources.class).configureEach { + duplicatesStrategy = DuplicatesStrategy.INCLUDE +} publishing { publications { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9492014..db9a6b8 100644 --- 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-6.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists