Various fixes (#45)

* update nativeutils to fix arm builds

* Pin CI to 22.04 and fix macos arch + target

* update opencv version
This commit is contained in:
Ryan Blue
2024-12-07 17:09:48 -05:00
committed by GitHub
parent 9419c4cf30
commit e7a7440903
3 changed files with 9 additions and 9 deletions

View File

@@ -21,7 +21,7 @@ jobs:
artifact-name: Linux
build-options: ""
name: "Build - ${{ matrix.artifact-name }}"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ${{ matrix.container }}
steps:
- uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
build-host:
env:
MACOSX_DEPLOYMENT_TARGET: 13
MACOSX_DEPLOYMENT_TARGET: 13.3
strategy:
fail-fast: false
matrix:
@@ -50,7 +50,7 @@ jobs:
architecture: x64
- os: macos-14
artifact-name: macOS
architecture: x64
architecture: aarch64
name: "Build - ${{ matrix.artifact-name }}"
runs-on: ${{ matrix.os }}
steps:
@@ -74,7 +74,7 @@ jobs:
combine:
name: Combine
needs: [build-docker, build-host]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:

View File

@@ -4,8 +4,8 @@ plugins {
id 'cpp'
id 'java'
id 'google-test'
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
id 'edu.wpi.first.NativeUtils' version '2025.6.0'
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2025.0'
id 'edu.wpi.first.NativeUtils' version '2025.8.0'
id 'edu.wpi.first.GradleJni' version '1.1.0'
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
}
@@ -45,7 +45,7 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-annotations:2.15.2"
implementation "com.fasterxml.jackson.core:jackson-core:2.15.2"
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2"
implementation 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:4.8.0-4'
implementation 'edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:4.10.0-2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

View File

@@ -9,9 +9,9 @@ nativeUtils {
wpi {
configureDependencies {
wpiVersion = wpilibVersion
opencvYear = "frc2024"
opencvYear = "frc2025"
niLibVersion = "2025.0.0"
opencvVersion = "4.8.0-4"
opencvVersion = "4.10.0-2"
}
}
}