Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/build_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
tags: ['v*']
pull_request:


jobs:
build_linux:
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 6 additions & 1 deletion EOCV-Sim/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ sourceSets {
srcDirs = ['src/bootstrap/java']
}
}

natives {}
}

tasks.named('compileBootstrapJava', JavaCompile) {
Expand All @@ -48,6 +50,7 @@ shadowJar {

from(sourceSets.main.output)
from(sourceSets.bootstrap.output)
from(sourceSets.natives.output)

manifest {
attributes(
Expand All @@ -58,6 +61,8 @@ shadowJar {

test {
useJUnitPlatform()
dependsOn processNativesResources
classpath += sourceSets.natives.output
}

apply from: '../test-logging.gradle'
Expand Down Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
3 changes: 2 additions & 1 deletion TeamCode/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 0 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading