From 2f61cb1cd8d4b7bb731e047b9e18f64d73c5c356 Mon Sep 17 00:00:00 2001 From: Botifier - Matthew Young Date: Mon, 1 Sep 2025 17:08:48 -0400 Subject: [PATCH 1/2] Maven fixes --- .gitignore | 3 ++- BECS-Annotation-Processing/.factorypath | 12 ++++++++++++ BECS-Annotation-Processing/.gitignore | 1 + .../.settings/org.eclipse.jdt.apt.core.prefs | 4 ++++ .../.settings/org.eclipse.jdt.core.prefs | 1 + BECS-Annotation-Processing/pom.xml | 11 +---------- BECS-Assets/.factorypath | 12 ++++++++++++ BECS-Assets/.gitignore | 1 + .../.settings/org.eclipse.jdt.apt.core.prefs | 4 ++++ .../.settings/org.eclipse.jdt.core.prefs | 1 + BECS-Core/.factorypath | 11 ++++++++++- BECS-Core/.gitignore | 1 + .../.settings/org.eclipse.jdt.apt.core.prefs | 4 ++-- BECS-Core/pom.xml | 10 ---------- BECS-Tests/.factorypath | 12 ++++++++++++ BECS-Tests/.gitignore | 1 + .../.settings/org.eclipse.jdt.apt.core.prefs | 4 ++++ .../.settings/org.eclipse.jdt.core.prefs | 1 + BECS-Tests/pom.xml | 11 +---------- pom.xml | 18 ++++++++---------- 20 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 BECS-Annotation-Processing/.factorypath create mode 100644 BECS-Annotation-Processing/.gitignore create mode 100644 BECS-Annotation-Processing/.settings/org.eclipse.jdt.apt.core.prefs create mode 100644 BECS-Assets/.factorypath create mode 100644 BECS-Assets/.gitignore create mode 100644 BECS-Assets/.settings/org.eclipse.jdt.apt.core.prefs create mode 100644 BECS-Core/.gitignore create mode 100644 BECS-Tests/.factorypath create mode 100644 BECS-Tests/.gitignore create mode 100644 BECS-Tests/.settings/org.eclipse.jdt.apt.core.prefs diff --git a/.gitignore b/.gitignore index 790904d..676a6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,5 @@ replay_pid* **/.idea **/natives -**/licenses \ No newline at end of file +**/licenses +/bin/ diff --git a/BECS-Annotation-Processing/.factorypath b/BECS-Annotation-Processing/.factorypath new file mode 100644 index 0000000..5aee3ac --- /dev/null +++ b/BECS-Annotation-Processing/.factorypath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/BECS-Annotation-Processing/.gitignore b/BECS-Annotation-Processing/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/BECS-Annotation-Processing/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/BECS-Annotation-Processing/.settings/org.eclipse.jdt.apt.core.prefs b/BECS-Annotation-Processing/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..dfa4f3a --- /dev/null +++ b/BECS-Annotation-Processing/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations diff --git a/BECS-Annotation-Processing/.settings/org.eclipse.jdt.core.prefs b/BECS-Annotation-Processing/.settings/org.eclipse.jdt.core.prefs index eeac0e7..7f3081d 100644 --- a/BECS-Annotation-Processing/.settings/org.eclipse.jdt.core.prefs +++ b/BECS-Annotation-Processing/.settings/org.eclipse.jdt.core.prefs @@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 diff --git a/BECS-Annotation-Processing/pom.xml b/BECS-Annotation-Processing/pom.xml index 88133f3..715f820 100644 --- a/BECS-Annotation-Processing/pom.xml +++ b/BECS-Annotation-Processing/pom.xml @@ -5,16 +5,6 @@ BECS 0.0.1-SNAPSHOT - - - local-repo - file://${user.home}/.m2/repository - - - central - https://repo.maven.apache.org/maven2 - - BECS-Annotation-Processing @@ -43,6 +33,7 @@ maven-assembly-plugin + 3.7.1 jar-with-dependencies diff --git a/BECS-Assets/.factorypath b/BECS-Assets/.factorypath new file mode 100644 index 0000000..5aee3ac --- /dev/null +++ b/BECS-Assets/.factorypath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/BECS-Assets/.gitignore b/BECS-Assets/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/BECS-Assets/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/BECS-Assets/.settings/org.eclipse.jdt.apt.core.prefs b/BECS-Assets/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..dfa4f3a --- /dev/null +++ b/BECS-Assets/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations diff --git a/BECS-Assets/.settings/org.eclipse.jdt.core.prefs b/BECS-Assets/.settings/org.eclipse.jdt.core.prefs index eeac0e7..7f3081d 100644 --- a/BECS-Assets/.settings/org.eclipse.jdt.core.prefs +++ b/BECS-Assets/.settings/org.eclipse.jdt.core.prefs @@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 diff --git a/BECS-Core/.factorypath b/BECS-Core/.factorypath index d9413a2..5aee3ac 100644 --- a/BECS-Core/.factorypath +++ b/BECS-Core/.factorypath @@ -1,3 +1,12 @@ - + + + + + + + + + + diff --git a/BECS-Core/.gitignore b/BECS-Core/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/BECS-Core/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/BECS-Core/.settings/org.eclipse.jdt.apt.core.prefs b/BECS-Core/.settings/org.eclipse.jdt.apt.core.prefs index fa6bcfb..eb9e0b3 100644 --- a/BECS-Core/.settings/org.eclipse.jdt.apt.core.prefs +++ b/BECS-Core/.settings/org.eclipse.jdt.apt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 org.eclipse.jdt.apt.aptEnabled=true -org.eclipse.jdt.apt.genSrcDir=.apt_generated -org.eclipse.jdt.apt.genTestSrcDir=.apt_generated_tests +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/BECS-Core/pom.xml b/BECS-Core/pom.xml index f7e2a1d..eca5fef 100644 --- a/BECS-Core/pom.xml +++ b/BECS-Core/pom.xml @@ -8,16 +8,6 @@ BECS 0.0.1-SNAPSHOT - - - local-repo - file://${user.home}/.m2/repository - - - central - https://repo.maven.apache.org/maven2 - - BECS diff --git a/BECS-Tests/.factorypath b/BECS-Tests/.factorypath new file mode 100644 index 0000000..5aee3ac --- /dev/null +++ b/BECS-Tests/.factorypath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/BECS-Tests/.gitignore b/BECS-Tests/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/BECS-Tests/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/BECS-Tests/.settings/org.eclipse.jdt.apt.core.prefs b/BECS-Tests/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..dfa4f3a --- /dev/null +++ b/BECS-Tests/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations diff --git a/BECS-Tests/.settings/org.eclipse.jdt.core.prefs b/BECS-Tests/.settings/org.eclipse.jdt.core.prefs index eeac0e7..7f3081d 100644 --- a/BECS-Tests/.settings/org.eclipse.jdt.core.prefs +++ b/BECS-Tests/.settings/org.eclipse.jdt.core.prefs @@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 diff --git a/BECS-Tests/pom.xml b/BECS-Tests/pom.xml index b1d7235..a9d9ed7 100644 --- a/BECS-Tests/pom.xml +++ b/BECS-Tests/pom.xml @@ -6,16 +6,6 @@ BECS 0.0.1-SNAPSHOT - - - local-repo - file://${user.home}/.m2/repository - - - central - https://repo.maven.apache.org/maven2 - - BECS-Tests BECS Tests @@ -71,6 +61,7 @@ maven-assembly-plugin + 3.7.1 diff --git a/pom.xml b/pom.xml index c9259b0..0209cdd 100644 --- a/pom.xml +++ b/pom.xml @@ -8,16 +8,6 @@ 0.0.1-SNAPSHOT BECS Game development library utilizing lwjgl - - - local-repo - file://${user.home}/.m2/repository - - - central - https://repo.maven.apache.org/maven2 - - UTF-8 3.3.0 @@ -204,36 +194,43 @@ org.lwjgl lwjgl ${lwjgl.natives} + ${lwjgl.version} org.lwjgl lwjgl-assimp ${lwjgl.natives} + ${lwjgl.version} org.lwjgl lwjgl-glfw ${lwjgl.natives} + ${lwjgl.version} org.lwjgl lwjgl-openal ${lwjgl.natives} + ${lwjgl.version} org.lwjgl lwjgl-opengl ${lwjgl.natives} + ${lwjgl.version} org.lwjgl lwjgl-stb ${lwjgl.natives} + ${lwjgl.version} org.lwjgl lwjgl-vma ${lwjgl.natives} + ${lwjgl.version} org.joml @@ -312,6 +309,7 @@ maven-assembly-plugin + 3.7.1 From 749edf9a33a28bc3ef0afce2ff4bbde546b3c292 Mon Sep 17 00:00:00 2001 From: Botifier - Matthew Young Date: Mon, 1 Sep 2025 17:33:09 -0700 Subject: [PATCH 2/2] Update .gitignore Keep licenses --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 676a6f1..5b4490e 100644 --- a/.gitignore +++ b/.gitignore @@ -42,5 +42,4 @@ replay_pid* **/.idea **/natives -**/licenses /bin/