From 95eb07ca79b74877375472cde1a27a8396431718 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 21 Sep 2024 11:47:40 -0500 Subject: [PATCH] add commented out attempt at relocating Sqlite --- build.gradle | 23 ++++++++++++++++++++--- coreSubProjects | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 4cd27f80e..36f401019 100644 --- a/build.gradle +++ b/build.gradle @@ -294,9 +294,26 @@ subprojects { p -> // Logging relocate "org.slf4j", "${librariesLocation}.slf4j" - // Sqlite Database - //At the moment, there is a bug in this library which doesnt allow it to be relocated -// relocate "org.sqlite", "${librariesLocation}.sqlite" +// // Sqlite Database +// // James can't determine how to relocate the library correctly so this is commented out +// relocate ("org.sqlite", "${librariesLocation}.sqlite") { +// exclude("org/sqlite/core/NativeDB/**") +// +// exclude("org/sqlite/native/FreeBSD/**") +// exclude("org/sqlite/native/Linux-Android/**") +// exclude("org/sqlite/native/Linux-Musl/**") +// exclude("org/sqlite/native/Linux/arm/**") +// exclude("org/sqlite/native/Linux/aarch64/**") +// exclude("org/sqlite/native/Linux/armv6/**") +// exclude("org/sqlite/native/Linux/x86/**") +// exclude("org/sqlite/native/Linux/armv7/**") +// exclude("org/sqlite/native/Linux/ppc64/**") +// exclude("org/sqlite/native/Linux/riscv64/**") +// exclude("org/sqlite/native/Windows/armv7/**") +// exclude("org/sqlite/native/Windows/aarch64/**") +// exclude("org/sqlite/native/Windows/armv7/**") +// } + // JOML if (project.hasProperty("embed_joml") && embed_joml == "true") diff --git a/coreSubProjects b/coreSubProjects index d4cad8f71..d0b50d963 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit d4cad8f718fd923115a3c7d1f9fcd3dab4ce0053 +Subproject commit d0b50d96333529a36685e099425acc7685b4865a