diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 11e1f94a3e..15e2c32682 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,5 +5,5 @@ repositories { } } dependencies { - implementation "edu.wpi.first:native-utils:2023.8.0" + implementation "edu.wpi.first:native-utils:2023.8.2" } diff --git a/cscore/build.gradle b/cscore/build.gradle index 6f3a678d63..9b63b618af 100644 --- a/cscore/build.gradle +++ b/cscore/build.gradle @@ -61,8 +61,13 @@ model { if (!it.buildable || !(it instanceof NativeBinarySpec)) { return } - lib project: ':wpinet', library: 'wpinet', linkage: 'shared' - lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + if (it.component.name == "${nativeName}JNI") { + lib project: ':wpinet', library: 'wpinet', linkage: 'static' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' + } else { + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + } } } } diff --git a/ntcore/build.gradle b/ntcore/build.gradle index bf48619fb3..c5464cc5f4 100644 --- a/ntcore/build.gradle +++ b/ntcore/build.gradle @@ -297,8 +297,13 @@ model { if (!it.buildable || !(it instanceof NativeBinarySpec)) { return } - lib project: ':wpinet', library: 'wpinet', linkage: 'shared' - lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + if (it.component.name == "${nativeName}JNI") { + lib project: ':wpinet', library: 'wpinet', linkage: 'static' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' + } else { + lib project: ':wpinet', library: 'wpinet', linkage: 'shared' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' + } } } }