diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f25fa94..dc565f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest container: ${{ matrix.container }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - name: Fetch all history and metadata @@ -33,7 +33,7 @@ jobs: git fetch --prune --unshallow - name: Build with Gradle run: ./gradlew build --max-workers 1 ${{ matrix.build-options }} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: ${{ matrix.artifact-name }} path: build/allOutputs @@ -52,18 +52,19 @@ jobs: name: "Build - ${{ matrix.artifact-name }}" runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - name: Fetch all history and metadata run: git fetch --prune --unshallow - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: 11 + distribution: 'zulu' + java-version: 17 architecture: ${{ matrix.architecture }} - name: Build with Gradle run: ./gradlew build -Pbuildalldesktop - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: ${{ matrix.artifact-name }} path: build/allOutputs @@ -73,16 +74,17 @@ jobs: needs: [build-docker, build-host] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: repository: wpilibsuite/build-tools - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 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@v1 + - uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: 11 - name: Combine # if: | @@ -100,7 +102,7 @@ jobs: # RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE' # ARTIFACTORY_PUBLISH_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} # ARTIFACTORY_PUBLISH_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: Maven path: ~/releases diff --git a/build.gradle b/build.gradle index 37f98fa..56547be 100644 --- a/build.gradle +++ b/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 '2023.6.0' + id 'edu.wpi.first.NativeUtils' version '2023.11.1' id 'edu.wpi.first.GradleJni' version '1.0.0' id 'edu.wpi.first.GradleVsCode' version '1.3.0' } diff --git a/config.gradle b/config.gradle index a08645f..2b64a37 100644 --- a/config.gradle +++ b/config.gradle @@ -7,11 +7,9 @@ nativeUtils { wpi { configureDependencies { wpiVersion = "2023.+" - niLibVersion = "2023.1.0" - opencvVersion = "4.6.0-2" - googleTestVersion = "1.11.0-3" - imguiVersion = "1.88-8" - wpimathVersion = "2023.+" + niLibVersion = "2023.3.0" + opencvVersion = "4.6.0-3" + googleTestVersion = "1.12.1-1" } } }