Skip to content

Commit 017b585

Browse files
authored
Treat systemcore as a roborio like platform (#245)
1 parent d8555ca commit 017b585

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ java {
1313

1414
allprojects {
1515
group = "edu.wpi.first"
16-
version = "2025.10.1"
16+
version = "2025.11.1"
1717

1818
if (project.hasProperty('publishVersion')) {
1919
version = project.publishVersion

src/main/java/edu/wpi/first/nativeutils/vendordeps/WPIJavaVendorDepsExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public List<Provider<String>> jniDebug(String platform, String... ignore) {
7474
}
7575

7676
private List<Provider<String>> jniInternal(boolean debug, String platform, String... ignore) {
77-
boolean isRio = platform.equals(NativePlatforms.roborio);
77+
boolean isRio = platform.equals(NativePlatforms.roborio) || platform.equals(NativePlatforms.systemcore);
7878
boolean hwSim = vendorDeps.isHwSimulation();
7979
List<Provider<String>> deps = new ArrayList<>();
8080

src/main/java/edu/wpi/first/nativeutils/vendordeps/WPINativeVendorDepsExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void cpp(Object scope, String... ignore) {
101101

102102
private void cppVendorLibForBin(NativeBinarySpec bin, String[] ignore) {
103103
String prefix = vendorDeps.isHwSimulation() ? HW_SIM_PREFIX : SW_SIM_PREFIX;
104-
if (bin.getTargetPlatform().getName().equals(NativePlatforms.roborio)) {
104+
if (bin.getTargetPlatform().getName().equals(NativePlatforms.roborio) || bin.getTargetPlatform().getName().equals(NativePlatforms.systemcore)) {
105105
prefix = RIO_PREFIX;
106106
}
107107
for (NamedJsonDependency namedDep : vendorDeps.getDependencySet()) {

src/main/java/edu/wpi/first/nativeutils/vendordeps/WPIVendorDepsExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,8 @@ public boolean useInSwSim() {
318318
}
319319

320320
public boolean useInRio() {
321-
return Arrays.asList(binaryPlatforms).contains(NativePlatforms.roborio);
321+
List<String> list = Arrays.asList(binaryPlatforms);
322+
return list.contains(NativePlatforms.roborio) || list.contains(NativePlatforms.systemcore);
322323
}
323324

324325
public String groupId;

testing/cpp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import edu.wpi.first.nativeutils.vendordeps.WPIVendorDepsPlugin
33

44
plugins {
55
id "cpp"
6-
id "edu.wpi.first.NativeUtils" version "2025.10.1"
6+
id "edu.wpi.first.NativeUtils" version "2025.11.1"
77
}
88

99
nativeUtils.addWpiNativeUtils()

0 commit comments

Comments
 (0)