diff --git a/build.gradle b/build.gradle index 6779f76e..ce9e1571 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 94920145..db9a6b82 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 diff --git a/src/main/java/lwjgui/scene/Context.java b/src/main/java/lwjgui/scene/Context.java index 0d256c51..c4241cf7 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 {