From becbb104f2b7946d8ffcfcbac4e7cbec1a19bb9d Mon Sep 17 00:00:00 2001
From: Sebastian Erives <serivesmejia@gmail.com>
Date: Tue, 29 Oct 2024 05:35:16 -0600
Subject: [PATCH 1/2] Add mergeServiceFiles to shadowJar to prevent runtime
 issues with shrinkwrap

---
 EOCV-Sim/build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/EOCV-Sim/build.gradle b/EOCV-Sim/build.gradle
index b014a1e..7fccd3e 100644
--- a/EOCV-Sim/build.gradle
+++ b/EOCV-Sim/build.gradle
@@ -29,6 +29,10 @@ publishing {
 
 ext.kotest_version = '5.7.2'
 
+shadowJar {
+    mergeServiceFiles()
+}
+
 test {
     useJUnitPlatform()
 }
@@ -98,6 +102,7 @@ dependencies {
     implementation 'org.ow2.asm:asm:9.7'
 
     implementation 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:3.3.2'
+    implementation 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:3.3.2'
 }
 
 task(writeBuildClassJava) {

From a28a3f721886c5524fa2f92fec7df34ef296fb7d Mon Sep 17 00:00:00 2001
From: Sebastian Erives <serivesmejia@gmail.com>
Date: Tue, 29 Oct 2024 05:38:47 -0600
Subject: [PATCH 2/2] Add changelog for 3.8.1

---
 README.md    | 5 +++++
 build.gradle | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6151149..faf8cc9 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,11 @@ Join the [deltacv discord server](https://discord.gg/A3RMYzf6DA) !
 
 ### Formerly, EOCV-Sim was hosted on a [personal account repo](https://github.com/serivesmejia/EOCV-Sim/). Released prior to 3.0.0 can be found there for historic purposes.
 
+## [v3.8.1 - Shadow jar merge service files hotfix](https://github.com/deltacv/EOCV-Sim/releases/tag/v3.8.1)
+- This is the 26th release for EOCV-Sim
+    - Bugfixes:
+        - Fixes shadow jar, uses mergeServiceFiles to fix failing to pull plugins from a maven repository
+
 ## [v3.8.0 - Major Plugin System Rework](https://github.com/deltacv/EOCV-Sim/releases/tag/v3.8.0)
 - This is the 25th release for EOCV-Sim
     - Changelog
diff --git a/build.gradle b/build.gradle
index e5d86be..a8b77e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ plugins {
 
 allprojects {
     group 'com.github.deltacv'
-    version '3.8.0'
+    version '3.8.1'
 
     apply plugin: 'java'