Skip to content

Commit c273038

Browse files
author
Patrick Jackson
committed
Merge branch 'master' into kotlin-1.4.0
2 parents 7f85b6a + 0c6de92 commit c273038

File tree

4 files changed

+32
-62
lines changed

4 files changed

+32
-62
lines changed

.circleci/config.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/pull_request.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: PR
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- 'docs/**'
7+
- '*.md'
8+
9+
jobs:
10+
ktlint:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
16+
- name: Ktlint
17+
uses: "vroy/gha-kotlin-linter@v1"
18+
test:
19+
runs-on: ${{ matrix.os }}
20+
strategy:
21+
matrix:
22+
os: [macos-latest, windows-latest, ubuntu-latest]
23+
24+
steps:
25+
- uses: actions/checkout@v2
26+
27+
- name: Test
28+
run: ./gradlew build

.github/workflows/test.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

redux-kotlin-thunk/src/commonMain/kotlin/org/reduxkotlin/Thunk.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ fun <State> createThunkMiddleware(extraArgument: Any? = null): ThunkMiddleware<S
2929
if (action is Function<*>) {
3030
@Suppress("UNCHECKED_CAST")
3131
val thunk = try {
32-
(action as Thunk<*>)
33-
} catch (e: ClassCastException) {
34-
throw IllegalArgumentException("Dispatching functions must use type Thunk:", e)
35-
}
32+
(action as Thunk<*>)
33+
} catch (e: ClassCastException) {
34+
throw IllegalArgumentException("Dispatching functions must use type Thunk:", e)
35+
}
3636
thunk(store.dispatch, store.getState, extraArgument)
3737
} else {
3838
next(action)

0 commit comments

Comments
 (0)