Skip to content

Commit

Permalink
Merge pull request #179 from nubank/update-deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
marcobiscaro2112 authored Aug 27, 2024
2 parents f9e99b9 + 57e6b8f commit 4f2f888
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 63 deletions.
43 changes: 13 additions & 30 deletions .github/workflows/clojure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,19 @@ on:
branches: [ master ]

jobs:
test-using-java-8:
name: 'Test using Java 8'
test-using-java:
strategy:
matrix:
java-version: [ '8', '11', '17', '21' ]
name: Test using Java ${{ matrix.java-version }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: 8

- name: Print java version
run: java -version

- name: Install dependencies
run: lein deps

- name: Run clj tests
run: lein test

- name: Run midje tests
run: lein midje

test-using-java-11:
name: 'Test using Java 11'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-java@v1
with:
java-version: 11
distribution: 'temurin'
java-version: ${{ matrix.java-version }}

- name: Print java version
run: java -version
Expand All @@ -55,11 +37,12 @@ jobs:
name: 'Lint'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'temurin'
java-version: 21

- name: Lint check
run: lein lint
40 changes: 11 additions & 29 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,19 @@ on:
- '*'

jobs:
test-using-java-8:
name: 'Test using Java 8'
test-using-java:
strategy:
matrix:
java-version: [ '8', '11', '17', '21' ]
name: Test using Java ${{ matrix.java-version }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-java@v1
- uses: actions/setup-java@v4
with:
java-version: 8

- name: Print java version
run: java -version

- name: Install dependencies
run: lein deps

- name: Run clj tests
run: lein test

- name: Run midje tests
run: lein midje

test-using-java-11:
name: 'Test using Java 11'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-java@v1
with:
java-version: 11
distribution: 'temurin'
java-version: ${{ matrix.java-version }}

- name: Print java version
run: java -version
Expand All @@ -53,9 +35,9 @@ jobs:
release:
name: 'Publish on Clojars'
runs-on: ubuntu-latest
needs: [test-using-java-11, test-using-java-8]
needs: test-using-java
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install dependencies
run: lein deps
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [5.18.0]
- Bump dependencies
- org.clojure/clojure from 1.11.1 to 1.11.4
- com.taoensso/timbre from 4.10.0 to 6.5.0
- nubank/matcher-combinators from 3.5.0 to 3.9.1

## [5.17.0]
- revert linter `state-flow.labs.state/with-redefs`

Expand Down
8 changes: 4 additions & 4 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject nubank/state-flow "5.17.0"
(defproject nubank/state-flow "5.18.0"
:description "Integration testing with composable flows"
:url "https://github.com/nubank/state-flow"
:license {:name "MIT"}
Expand All @@ -18,7 +18,7 @@
[lein-nsorg "0.3.0"]
[changelog-check "0.1.0"]]

:dependencies [[org.clojure/clojure "1.11.3"]
:dependencies [[org.clojure/clojure "1.11.4"]
[com.taoensso/timbre "6.5.0"]
[funcool/cats "2.4.2"]
[nubank/matcher-combinators "3.9.1"]]
Expand All @@ -32,11 +32,11 @@

:profiles {:uberjar {:aot :all}
:dev {:source-paths ["dev"]
:dependencies [[ns-tracker "0.4.0"]
:dependencies [[ns-tracker "1.0.0"]
[org.clojure/tools.namespace "1.5.0"]
[midje "1.10.10"]
[org.clojure/java.classpath "1.1.0"]
[rewrite-clj "1.1.47"]]}}
[rewrite-clj "1.1.48"]]}}

:aliases {"coverage" ["cloverage" "-s" "coverage"]
"lint" ["do" ["cljfmt" "check"] ["nsorg"]]
Expand Down

0 comments on commit 4f2f888

Please sign in to comment.