Update deprecated actions and bump macos target (#33)
Change JDK to temurin Update Gradle to 8.5 Bump Jackson version
This commit is contained in:
parent
0262900d2c
commit
e06eda365a
22
.github/workflows/ci.yml
vendored
22
.github/workflows/ci.yml
vendored
@ -32,15 +32,15 @@ jobs:
|
||||
run: |
|
||||
git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew build --max-workers 1 ${{ matrix.build-options }}
|
||||
- uses: actions/upload-artifact@v3
|
||||
run: ./gradlew build ${{ matrix.build-options }}
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ matrix.artifact-name }}
|
||||
path: build/allOutputs
|
||||
|
||||
build-host:
|
||||
env:
|
||||
MACOSX_DEPLOYMENT_TARGET: 12
|
||||
MACOSX_DEPLOYMENT_TARGET: 13
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
@ -48,7 +48,7 @@ jobs:
|
||||
- os: windows-2022
|
||||
artifact-name: Win64
|
||||
architecture: x64
|
||||
- os: macos-12
|
||||
- os: macos-14
|
||||
artifact-name: macOS
|
||||
architecture: x64
|
||||
name: "Build - ${{ matrix.artifact-name }}"
|
||||
@ -59,14 +59,14 @@ jobs:
|
||||
submodules: true
|
||||
- name: Fetch all history and metadata
|
||||
run: git fetch --prune --unshallow
|
||||
- uses: actions/setup-java@v3
|
||||
- uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
distribution: 'temurin'
|
||||
java-version: 17
|
||||
architecture: ${{ matrix.architecture }}
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew build -Pbuildalldesktop
|
||||
- uses: actions/upload-artifact@v3
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ matrix.artifact-name }}
|
||||
path: build/allOutputs
|
||||
@ -79,14 +79,14 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
repository: wpilibsuite/build-tools
|
||||
- uses: actions/download-artifact@v3
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
path: combiner/products/build/allOutputs
|
||||
- name: Flatten Artifacts
|
||||
run: rsync -a --delete combiner/products/build/allOutputs/*/* combiner/products/build/allOutputs/
|
||||
- uses: actions/setup-java@v3
|
||||
- uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
distribution: 'temurin'
|
||||
java-version: 17
|
||||
- name: Combine
|
||||
# if: |
|
||||
@ -104,7 +104,7 @@ jobs:
|
||||
# RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE'
|
||||
# ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
|
||||
# ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
|
||||
- uses: actions/upload-artifact@v3
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Maven
|
||||
path: ~/releases
|
||||
|
10
build.gradle
10
build.gradle
@ -3,7 +3,7 @@ plugins {
|
||||
id 'java'
|
||||
id 'google-test'
|
||||
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
|
||||
id 'edu.wpi.first.NativeUtils' version '2024.6.1'
|
||||
id 'edu.wpi.first.NativeUtils' version '2024.7.2'
|
||||
id 'edu.wpi.first.GradleJni' version '1.1.0'
|
||||
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
|
||||
}
|
||||
@ -31,9 +31,9 @@ dependencies {
|
||||
implementation 'edu.wpi.first.wpiunits:wpiunits-java:2024.+'
|
||||
implementation 'edu.wpi.first.hal:hal-java:2024.+'
|
||||
implementation "org.ejml:ejml-simple:0.43.1"
|
||||
implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.4"
|
||||
implementation "com.fasterxml.jackson.core:jackson-core:2.12.4"
|
||||
implementation "com.fasterxml.jackson.core:jackson-databind:2.12.4"
|
||||
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-2'
|
||||
}
|
||||
|
||||
@ -126,5 +126,5 @@ model {
|
||||
apply from: 'publish.gradle'
|
||||
|
||||
wrapper {
|
||||
gradleVersion '8.4'
|
||||
gradleVersion '8.5'
|
||||
}
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
Loading…
Reference in New Issue
Block a user