Skip to content

Commit 689194a

Browse files
authored
Merge branch 'master' into iosbackend
2 parents 2802158 + 530c865 commit 689194a

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/bounty.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: startsWith(github.event.label.name, 'diff:')
1515
steps:
1616
- name: Comment bounty info
17-
uses: actions/github-script@v8.0.0
17+
uses: actions/github-script@v9.0.0
1818
env:
1919
FORUM_URL: "https://hub.jmonkeyengine.org/t/bounty-program-trial-starts-today/49394/"
2020
RESERVE_HOURS: "48"

.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
run: |
7777
./gradlew checkstyleMain checkstyleTest --console=plain --stacktrace
7878
- name: Upload Checkstyle Reports
79-
uses: actions/upload-artifact@v7.0.0
79+
uses: actions/upload-artifact@v7.0.1
8080
if: always()
8181
with:
8282
name: checkstyle-report
@@ -103,7 +103,7 @@ jobs:
103103
run: |
104104
./gradlew -PenableSpotBugs=true spotbugsMain spotbugsTest --console=plain --stacktrace
105105
- name: Upload SpotBugs Reports
106-
uses: actions/upload-artifact@v7.0.0
106+
uses: actions/upload-artifact@v7.0.1
107107
if: always()
108108
with:
109109
name: spotbugs-report
@@ -145,7 +145,7 @@ jobs:
145145
run: |
146146
./gradlew :jme3-screenshot-test:screenshotTest
147147
- name: Upload Test Reports
148-
uses: actions/upload-artifact@v7.0.0
148+
uses: actions/upload-artifact@v7.0.1
149149
if: always()
150150
with:
151151
name: screenshot-test-report
@@ -193,7 +193,7 @@ jobs:
193193
:jme3-android-native:assemble
194194
195195
- name: Upload natives
196-
uses: actions/upload-artifact@v7.0.0
196+
uses: actions/upload-artifact@v7.0.1
197197
with:
198198
name: android-natives
199199
path: build/native
@@ -286,30 +286,30 @@ jobs:
286286
# Used later by DeploySnapshot
287287
- name: Upload merged natives
288288
if: matrix.deploy==true
289-
uses: actions/upload-artifact@v7.0.0
289+
uses: actions/upload-artifact@v7.0.1
290290
with:
291291
name: natives
292292
path: dist/jme3-natives.zip
293293

294294
# Upload maven artifacts to be used later by the deploy job
295295
- name: Upload maven artifacts
296296
if: matrix.deploy==true
297-
uses: actions/upload-artifact@v7.0.0
297+
uses: actions/upload-artifact@v7.0.1
298298
with:
299299
name: maven
300300
path: dist/maven
301301

302302
- name: Upload javadoc
303303
if: matrix.deploy==true
304-
uses: actions/upload-artifact@v7.0.0
304+
uses: actions/upload-artifact@v7.0.1
305305
with:
306306
name: javadoc
307307
path: dist/javadoc
308308

309309
# Upload release archive to be used later by the deploy job
310310
- name: Upload release
311311
if: github.event_name == 'release' && matrix.deploy==true
312-
uses: actions/upload-artifact@v7.0.0
312+
uses: actions/upload-artifact@v7.0.1
313313
with:
314314
name: release
315315
path: dist/release

.github/workflows/screenshot-test-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
allowed-conclusions: success,skipped,failure
3434
- name: Check Screenshot Tests status
3535
id: check-status
36-
uses: actions/github-script@v8.0.0
36+
uses: actions/github-script@v9.0.0
3737
with:
3838
github-token: ${{ secrets.GITHUB_TOKEN }}
3939
script: |

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spotbugs = "4.9.8"
1212

1313
[libraries]
1414

15-
androidx-annotation = "androidx.annotation:annotation:1.7.1"
15+
androidx-annotation = "androidx.annotation:annotation:1.10.0"
1616
androidx-fragment = "androidx.fragment:fragment:1.8.9"
1717
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.7.0"
1818
android-build-gradle = "com.android.tools.build:gradle:9.1.0"

0 commit comments

Comments
 (0)