Skip to content

Commit dec012b

Browse files
committed
Merge branch '2.x' of github.com:manuel-martos/appyx into 2.x
2 parents 092a183 + dbb51b3 commit dec012b

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
distribution: 'zulu'
2323
java-version: '17'
2424
- uses: gradle/wrapper-validation-action@v2
25-
- uses: gradle/gradle-build-action@v3
25+
- uses: gradle/actions/setup-gradle@v3
2626
with:
2727
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
2828
- name: Build
@@ -58,7 +58,7 @@ jobs:
5858
category: detekt
5959
- name: Upload failure artifacts
6060
if: failure()
61-
uses: actions/upload-artifact@v3
61+
uses: actions/upload-artifact@v4
6262
with:
6363
name: reports
6464
path: |
@@ -75,7 +75,7 @@ jobs:
7575
distribution: 'zulu'
7676
java-version: '17'
7777
- uses: gradle/wrapper-validation-action@v2
78-
- uses: gradle/gradle-build-action@v3
78+
- uses: gradle/actions/setup-gradle@v3
7979
with:
8080
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
8181
- name: Check publication setup
@@ -99,7 +99,7 @@ jobs:
9999
distribution: 'zulu'
100100
java-version: '17'
101101
- uses: gradle/wrapper-validation-action@v2
102-
- uses: gradle/gradle-build-action@v3
102+
- uses: gradle/actions/setup-gradle@v3
103103
with:
104104
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
105105
- name: Setup Android SDK
@@ -119,7 +119,7 @@ jobs:
119119
-Dorg.gradle.jvmargs=-Xmx2048m
120120
- name: Upload failed instrumentation artifacts
121121
if: failure()
122-
uses: actions/upload-artifact@v3
122+
uses: actions/upload-artifact@v4
123123
with:
124124
name: instrumentation-failures
125125
path: |
@@ -137,7 +137,7 @@ jobs:
137137
distribution: 'zulu'
138138
java-version: '17'
139139
- uses: gradle/wrapper-validation-action@v2
140-
- uses: gradle/gradle-build-action@v3
140+
- uses: gradle/actions/setup-gradle@v3
141141
with:
142142
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
143143
- name: Setup Android SDK
@@ -153,7 +153,7 @@ jobs:
153153
-Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
154154
- name: Upload failed screenshot artifacts
155155
if: failure()
156-
uses: actions/upload-artifact@v3
156+
uses: actions/upload-artifact@v4
157157
with:
158158
name: screenshot-failures
159159
path: |
@@ -163,15 +163,15 @@ jobs:
163163
164164
check-documentation:
165165
name: Check documentation
166-
runs-on: macOS-latest
166+
runs-on: ubuntu-latest
167167
steps:
168168
- uses: actions/checkout@v4
169169
- uses: actions/setup-java@v4
170170
with:
171171
distribution: 'zulu'
172172
java-version: '17'
173173
- uses: gradle/wrapper-validation-action@v2
174-
- uses: gradle/gradle-build-action@v3
174+
- uses: gradle/actions/setup-gradle@v3
175175
with:
176176
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
177177
- name: Generate distributions

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
distribution: 'zulu'
2121
java-version: '17'
2222
- uses: gradle/wrapper-validation-action@v2
23-
- uses: gradle/gradle-build-action@v3
23+
- uses: gradle/actions/setup-gradle@v3
2424
with:
2525
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
2626
- run: pip install mkdocs-material

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ on:
88
jobs:
99
publish:
1010
name: Publish
11-
runs-on: ubuntu-latest
11+
runs-on: macOS-latest
1212
steps:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-java@v4
1515
with:
1616
distribution: 'zulu'
1717
java-version: '17'
1818
- uses: gradle/wrapper-validation-action@v2
19-
- uses: gradle/gradle-build-action@v3
19+
- uses: gradle/actions/setup-gradle@v3
2020
env:
2121
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
2222
with:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Please refer to [2.0.0-alpha10 -> 2.0.0 – Migration guide](2.0.0.md)
2828
### Enhancement
2929

3030
- [#679](https://github.com/bumble-tech/appyx/pull/679) – Simple api for backStackNode and spotlightNode
31-
31+
- [#689](https://github.com/bumble-tech/appyx/pull/689) - Add support for Kotlin/Wasm
3232

3333
<div style="text-align: center"><small>19 Apr 2024</small></div>
3434

0 commit comments

Comments
 (0)