diff --git a/build.gradle b/build.gradle index f4c8281fd4..c6c9ca2915 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { id "com.diffplug.spotless" version "6.22.0" id "edu.wpi.first.NativeUtils" version "2024.6.1" apply false - id 'edu.wpi.first.GradleJni' version '1.1.0' id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2" id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-4" id 'edu.wpi.first.WpilibTools' version '1.3.0' diff --git a/shared/javacpp/setupBuild.gradle b/shared/javacpp/setupBuild.gradle index 6ebc1dfcbb..8128daa677 100644 --- a/shared/javacpp/setupBuild.gradle +++ b/shared/javacpp/setupBuild.gradle @@ -1,7 +1,6 @@ apply plugin: 'cpp' apply plugin: 'google-test-test-suite' apply plugin: 'edu.wpi.first.NativeUtils' -apply plugin: 'edu.wpi.first.GradleJni' apply from: "${rootDir}/shared/config.gradle" apply from: "${rootDir}/shared/javacommon.gradle" @@ -96,52 +95,6 @@ model { nativeUtils.useRequiredLibrary(it, name) } } - "${nativeName}JNI"(JniNativeLibrarySpec) { - baseName = nativeName + 'jni' - - enableCheckTask !project.hasProperty('skipJniCheck') - javaCompileTasks << compileJava - jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.roborio) - jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.linuxarm32) - jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.linuxarm64) - - sources { - cpp { - source { - srcDirs 'src/main/native/cpp' - if (project.hasProperty('generatedSources')) { - srcDir generatedSources - } - include '**/jni/**/*.cpp' - } - exportedHeaders { - srcDir 'src/main/native/include' - if (project.hasProperty('generatedHeaders')) { - srcDir generatedHeaders - } - include '**/*.h' - } - } - } - - binaries.all { - if (it instanceof StaticLibraryBinarySpec) { - it.buildable = false - return - } - lib library: "${nativeName}", linkage: 'shared' - if (!project.hasProperty('noWpiutil')) { - lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' - } - if (project.hasProperty('jniSplitSetup')) { - jniSplitSetup(it) - } - } - - if(project.hasProperty("jni_native_libs")) jni_native_libs.each { name -> - nativeUtils.useRequiredLibrary(it, name) - } - } } testSuites { "${nativeName}Test"(GoogleTestTestSuiteSpec) {