Skip to content

Commit 7aeed7c

Browse files
committed
Move native libraries into a separate source set
1 parent fd0fbb9 commit 7aeed7c

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

EOCV-Sim/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ sourceSets {
3030
srcDirs = ['src/bootstrap/java']
3131
}
3232
}
33+
34+
natives {}
3335
}
3436

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

4951
from(sourceSets.main.output)
5052
from(sourceSets.bootstrap.output)
53+
from(sourceSets.natives.output)
5154

5255
manifest {
5356
attributes(
@@ -58,6 +61,8 @@ shadowJar {
5861

5962
test {
6063
useJUnitPlatform()
64+
dependsOn processNativesResources
65+
classpath += sourceSets.natives.output
6166
}
6267

6368
apply from: '../test-logging.gradle'
@@ -92,7 +97,7 @@ def nativeTasks = wpilibTools.createExtractionTasks {
9297
configurationName = nativeConfigName
9398
}
9499

95-
nativeTasks.addToSourceSetResources(sourceSets.main)
100+
nativeTasks.addToSourceSetResources(sourceSets.natives)
96101

97102
nativeConfig.dependencies.add wpilibTools.deps.wpilib("wpiutil")
98103
nativeConfig.dependencies.add wpilibTools.deps.wpilib("cscore")

EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/util/LibraryLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static Result loadLibraries() {
3434
"apriltagjni", "wpimathjni", "wpinetjni", "cscorejni");
3535

3636
CombinedRuntimeLoader.loadLibraries(LibraryLoader.class, Core.NATIVE_LIBRARY_NAME);
37-
} catch(IOException | UnsatisfiedLinkError e) {
37+
} catch(Exception | UnsatisfiedLinkError e) {
3838
return new Result(false, e);
3939
}
4040

TeamCode/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies {
1111

1212
tasks.register('runSim', JavaExec) {
1313
dependsOn 'classes'
14+
dependsOn ':EOCV-Sim:processNativesResources'
1415
mainClass = 'com.github.serivesmejia.eocvsim.Main'
15-
classpath = sourceSets.main.runtimeClasspath
16+
classpath = sourceSets.main.runtimeClasspath + project(':EOCV-Sim').sourceSets.natives.output
1617
}

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ allprojects {
7272
mavenLocal()
7373
google()
7474
maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
75-
maven { url 'https://artifacts.openmicroscopy.org/artifactory/ome.releases/' }
76-
maven { url "https://maven.photonvision.org/releases" }
7775
}
7876

7977
wpilibRepositories.use2027Repos()

0 commit comments

Comments
 (0)