From c0b92ab1343a15d555fc1a2d1c254815cafbbe0f Mon Sep 17 00:00:00 2001 From: Mark Manes Date: Wed, 5 Jun 2024 10:38:59 -0600 Subject: [PATCH] Update deps and bump version Switch master branch to main --- .github/workflows/test.yml | 14 +++++++------- build.savant | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 799cbd8..a980c98 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,9 +1,9 @@ name: test -# Run the tests when code is pushed to `master` +# Run the tests when code is pushed to `main` on: push: - branches: [ master ] + branches: [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -13,8 +13,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 @@ -23,9 +23,9 @@ jobs: mkdir -p ~/dev/savant mkdir -p ~/.savant/plugins cd ~/dev/savant - curl -fSL https://github.com/savant-build/savant-core/releases/download/2.0.0-RC.6/savant-2.0.0-RC.6.tar.gz > savant.tar.gz + curl -fSL https://github.com/savant-build/savant-core/releases/download/2.0.0-RC.7/savant-2.0.0-RC.7.tar.gz > savant.tar.gz tar -xzf savant.tar.gz - ln -s savant-2.0.0-RC.6 current + ln -s savant-2.0.0-RC.7 current rm savant.tar.gz cat < ~/.savant/plugins/org.savantbuild.plugin.java.properties 17=${JAVA_HOME_17_X64} @@ -38,7 +38,7 @@ jobs: shell: bash - name: Archive TestNG reports if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: testng-reports path: build/test-reports diff --git a/build.savant b/build.savant index 83c668b..301bc7d 100644 --- a/build.savant +++ b/build.savant @@ -14,10 +14,10 @@ * language governing permissions and limitations under the License. */ jackson5Version = "3.0.1" - restifyVersion = "4.2.1" -testngVersion = "7.8.0" +restifyVersion = "4.2.1" +testngVersion = "7.10.2" -project(group: "io.fusionauth", name: "java-http", version: "0.3.4", licenses: ["ApacheV2_0"]) { +project(group: "io.fusionauth", name: "java-http", version: "0.3.5", licenses: ["ApacheV2_0"]) { workflow { fetch { // Dependency resolution order: @@ -54,7 +54,7 @@ project(group: "io.fusionauth", name: "java-http", version: "0.3.4", licenses: [ } // Plugins -dependency = loadPlugin(id: "org.savantbuild.plugin:dependency:2.0.0-RC.6") +dependency = loadPlugin(id: "org.savantbuild.plugin:dependency:2.0.0-RC.7") java = loadPlugin(id: "org.savantbuild.plugin:java:2.0.0-RC.6") javaTestNG = loadPlugin(id: "org.savantbuild.plugin:java-testng:2.0.0-RC.6") idea = loadPlugin(id: "org.savantbuild.plugin:idea:2.0.0-RC.7")