[build] Update to gradle 9.2.0, use new reorged plugins (#8471)

This commit is contained in:
Thad House
2025-12-13 21:44:00 -08:00
committed by GitHub
parent bcb5c5c16c
commit af0a3e9c2f
37 changed files with 87 additions and 178 deletions

View File

@@ -7,7 +7,6 @@ if (project.hasProperty('ciDebugOnly')) {
}
nativeUtils.addWpiNativeUtils()
nativeUtils.withCrossLinuxArm32()
nativeUtils.withCrossLinuxArm64()
nativeUtils.withCrossSystemCore()
nativeUtils {
@@ -19,6 +18,14 @@ nativeUtils {
}
}
if (project.hasProperty('onlylinuxarm64')) {
nativeUtils.crossCompilers.getByName(org.wpilib.toolchain.NativePlatforms.linuxarm64).optional = false
}
if (project.hasProperty('onlylinuxsystemcore')) {
nativeUtils.crossCompilers.getByName(org.wpilib.toolchain.NativePlatforms.systemcore).optional = false
}
nativeUtils.wpi.addWarnings()
nativeUtils.wpi.addWarningsAsErrors()
@@ -49,7 +56,7 @@ nativeUtils.platformConfigs.each {
}
}
nativeUtils.platformConfigs.linuxathena.linker.args.add("-Wl,--fatal-warnings")
nativeUtils.platformConfigs.linuxsystemcore.linker.args.add("-Wl,--fatal-warnings")
if (project.hasProperty('ntcoreffibuild')) {
// On windows, for ntcoreffi, use static runtime

View File

@@ -1,7 +1,7 @@
apply plugin: 'cpp'
apply plugin: 'google-test-test-suite'
apply plugin: 'visual-studio'
apply plugin: 'edu.wpi.first.NativeUtils'
apply plugin: 'org.wpilib.NativeUtils'
apply plugin: SingleNativeBuild
apply plugin: ExtraTasks

View File

@@ -1,8 +1,8 @@
apply plugin: 'cpp'
apply plugin: 'google-test-test-suite'
apply plugin: 'visual-studio'
apply plugin: 'edu.wpi.first.NativeUtils'
apply plugin: 'edu.wpi.first.GradleJni'
apply plugin: 'org.wpilib.NativeUtils'
apply plugin: 'org.wpilib.GradleJni'
apply plugin: SingleNativeBuild
apply plugin: ExtraTasks
@@ -112,7 +112,6 @@ model {
enableCheckTask !project.hasProperty('skipJniCheck')
javaCompileTasks << compileJava
jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.systemcore)
jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.linuxarm32)
jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.linuxarm64)
sources {
cpp {

View File

@@ -1,5 +1,5 @@
apply plugin: 'cpp'
apply plugin: 'edu.wpi.first.NativeUtils'
apply plugin: 'org.wpilib.NativeUtils'
apply plugin: ExtraTasks
if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsystemcore')) {