From 7aeed7cd563c5969f1c8cf708fc12f58bbe03244 Mon Sep 17 00:00:00 2001
From: Sebastian Erives <serivesmejia@deltacv.org>
Date: Wed, 20 May 2026 09:24:59 -0600
Subject: [PATCH 1/2] Move native libraries into a separate source set

---
 EOCV-Sim/build.gradle                                      | 7 ++++++-
 .../github/serivesmejia/eocvsim/util/LibraryLoader.java    | 2 +-
 TeamCode/build.gradle                                      | 3 ++-
 build.gradle                                               | 2 --
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/EOCV-Sim/build.gradle b/EOCV-Sim/build.gradle
index 6cad12e5..cea3b184 100644
--- a/EOCV-Sim/build.gradle
+++ b/EOCV-Sim/build.gradle
@@ -30,6 +30,8 @@ sourceSets {
             srcDirs = ['src/bootstrap/java']
         }
     }
+
+    natives {}
 }
 
 tasks.named('compileBootstrapJava', JavaCompile) {
@@ -48,6 +50,7 @@ shadowJar {
 
     from(sourceSets.main.output)
     from(sourceSets.bootstrap.output)
+    from(sourceSets.natives.output)
 
     manifest {
         attributes(
@@ -58,6 +61,8 @@ shadowJar {
 
 test {
     useJUnitPlatform()
+    dependsOn processNativesResources
+    classpath += sourceSets.natives.output
 }
 
 apply from: '../test-logging.gradle'
@@ -92,7 +97,7 @@ def nativeTasks = wpilibTools.createExtractionTasks {
     configurationName = nativeConfigName
 }
 
-nativeTasks.addToSourceSetResources(sourceSets.main)
+nativeTasks.addToSourceSetResources(sourceSets.natives)
 
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpiutil")
 nativeConfig.dependencies.add wpilibTools.deps.wpilib("cscore")
diff --git a/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/util/LibraryLoader.java b/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/util/LibraryLoader.java
index 0f349199..ab1d5cc1 100644
--- a/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/util/LibraryLoader.java
+++ b/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/util/LibraryLoader.java
@@ -34,7 +34,7 @@ public static Result loadLibraries() {
                     "apriltagjni", "wpimathjni", "wpinetjni", "cscorejni");
 
             CombinedRuntimeLoader.loadLibraries(LibraryLoader.class, Core.NATIVE_LIBRARY_NAME);
-        } catch(IOException | UnsatisfiedLinkError e) {
+        } catch(Exception | UnsatisfiedLinkError e) {
             return new Result(false, e);
         }
 
diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle
index 3b292b31..78b536d2 100644
--- a/TeamCode/build.gradle
+++ b/TeamCode/build.gradle
@@ -11,6 +11,7 @@ dependencies {
 
 tasks.register('runSim', JavaExec) {
     dependsOn 'classes'
+    dependsOn ':EOCV-Sim:processNativesResources'
     mainClass = 'com.github.serivesmejia.eocvsim.Main'
-    classpath = sourceSets.main.runtimeClasspath
+    classpath = sourceSets.main.runtimeClasspath + project(':EOCV-Sim').sourceSets.natives.output
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 51cadaaa..17d95717 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,8 +72,6 @@ allprojects {
         mavenLocal()
         google()
         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
-        maven { url 'https://artifacts.openmicroscopy.org/artifactory/ome.releases/' }
-        maven { url "https://maven.photonvision.org/releases" }
     }
 
     wpilibRepositories.use2027Repos()

From 5ca9ab98ff278657f77fecdbb90ea9a95caab4a8 Mon Sep 17 00:00:00 2001
From: Sebastian Erives <serivesmejia@deltacv.org>
Date: Wed, 20 May 2026 09:41:31 -0600
Subject: [PATCH 2/2] Remove build step in release job

---
 .github/workflows/build_ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build_ci.yml b/.github/workflows/build_ci.yml
index 967f3d05..9ab2a4d3 100644
--- a/.github/workflows/build_ci.yml
+++ b/.github/workflows/build_ci.yml
@@ -6,7 +6,6 @@ on:
     tags: ['v*']
   pull_request:
 
-
 jobs:
   build_linux:
     runs-on: ubuntu-24.04
@@ -146,9 +145,6 @@ jobs:
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
         run: ./gradlew -Penv=release :Common:publishToMavenCentral :Vision:publishToMavenCentral :EOCV-Sim:publishToMavenCentral -x test -x :EOCV-Sim:shadowJar
 
-      - name: Build release shadow jar with Gradle
-        run: ./gradlew -Penv=release shadowJar -x test
-
       - name: Download Linux artifacts
         uses: actions/download-artifact@v4
         with: