Skip to content

Commit 233cc03

Browse files
authored
Merge branch 'master' into 240105_camera_folder
2 parents fbd9a55 + 70073c4 commit 233cc03

File tree

467 files changed

+10733
-18812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

467 files changed

+10733
-18812
lines changed

.eslintrc

+2-6
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
"kroll": "readonly"
3434
},
3535
"rules": {
36-
"node/no-deprecated-api": "off",
37-
"node/no-unsupported-features/es-syntax": "off",
38-
"node/no-unsupported-features/node-builtins": ["warn", { "version": "10.11.0" }]
36+
"node/no-unsupported-features/es-syntax": "off"
3937
}
4038
},
4139
{
@@ -61,9 +59,7 @@
6159
"sourceType": "module"
6260
},
6361
"rules": {
64-
"node/no-deprecated-api": "off",
65-
"node/no-unsupported-features/es-syntax": "off",
66-
"node/no-unsupported-features/node-builtins": ["warn", { "version": "10.11.0" }]
62+
"node/no-unsupported-features/es-syntax": "off"
6763
}
6864
},
6965
{

.github/actions/build-android/action.yml

+7-15
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ runs:
2020
shell: bash
2121

2222
- name: Setup Node.js
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ inputs.node-version }}
2626
cache: 'npm'
2727

2828
- name: Setup Java
29-
uses: actions/setup-java@v3
29+
uses: actions/setup-java@v4
3030
with:
3131
distribution: 'adopt'
3232
java-version: ${{ inputs.java-version }}
@@ -36,7 +36,7 @@ runs:
3636
shell: bash
3737

3838
- name: Cache Gradle packages
39-
uses: actions/cache@v3
39+
uses: actions/cache@v4
4040
with:
4141
path: |
4242
~/.gradle/caches
@@ -49,24 +49,16 @@ runs:
4949
run: npm run lint:android
5050
shell: bash
5151

52-
- name: Set up Homebrew
53-
id: set-up-homebrew
54-
uses: Homebrew/actions/setup-homebrew@master
55-
5652
- name: Install ccache
57-
run: brew install ccache
58-
shell: bash
59-
60-
- name: Retrieve ccache
61-
uses: actions/cache@v3
53+
uses: hendrikmuhs/[email protected]
6254
with:
63-
path: ${{ env.CCACHE_DIR }}
55+
create-symlink: true
6456
key: ${{ runner.os }}-ccache-${{ github.sha }}
6557
restore-keys: |
6658
${{ runner.os }}-ccache-
6759
6860
- name: Cache V8
69-
uses: actions/cache@v3
61+
uses: actions/cache@v4
7062
with:
7163
path: dist/android/libv8
7264
key: libv8-${{ hashFiles('dist/android/libv8/**') }}
@@ -92,7 +84,7 @@ runs:
9284
dist/tmp/common
9385
shell: bash
9486

95-
- uses: actions/upload-artifact@v3
87+
- uses: actions/upload-artifact@v4
9688
with:
9789
name: android-build
9890
retention-days: 1

.github/actions/build-ios/action.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ inputs:
99
runs:
1010
using: composite
1111
steps:
12-
- name: Use Node.js 16.x
13-
uses: actions/setup-node@v3
12+
- name: Use Node.js
13+
uses: actions/setup-node@v4
1414
with:
15-
node-version: '16.x'
15+
node-version: ${{ inputs.node-version }}
1616
cache: 'npm'
1717

1818
- name: Install dependencies
@@ -34,7 +34,7 @@ runs:
3434
iphone/TitaniumKit/build/TitaniumKit.xcframework
3535
shell: bash
3636

37-
- uses: actions/upload-artifact@v3
37+
- uses: actions/upload-artifact@v4
3838
with:
3939
name: ios-build
4040
retention-days: 1

.github/actions/package/action.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ inputs:
1515
runs:
1616
using: composite
1717
steps:
18-
- name: Use Node.js 16.x
19-
uses: actions/setup-node@v3
18+
- name: Use Node.js
19+
uses: actions/setup-node@v4
2020
with:
2121
node-version: ${{ inputs.node-version }}
2222
cache: 'npm'
2323

24-
- name: Use JDK 11
25-
uses: actions/setup-java@v3
24+
- name: Use JDK
25+
uses: actions/setup-java@v4
2626
with:
2727
distribution: 'adopt'
2828
java-version: ${{ inputs.java-version }}
@@ -32,7 +32,7 @@ runs:
3232
shell: bash
3333

3434
- name: Cache Gradle packages
35-
uses: actions/cache@v3
35+
uses: actions/cache@v4
3636
with:
3737
path: |
3838
~/.gradle/caches
@@ -41,15 +41,15 @@ runs:
4141
restore-keys: |
4242
${{ runner.os }}-gradle-
4343
44-
- uses: actions/download-artifact@v3
44+
- uses: actions/download-artifact@v4
4545
with:
4646
name: android-build
4747

4848
- name: Extract Android build output
4949
run: tar -xzvf android-build.tar.gz
5050
shell: bash
5151

52-
- uses: actions/download-artifact@v3
52+
- uses: actions/download-artifact@v4
5353
with:
5454
name: ios-build
5555

@@ -58,7 +58,7 @@ runs:
5858
shell: bash
5959

6060
- name: Cache Native Modules
61-
uses: actions/cache@v3
61+
uses: actions/cache@v4
6262
with:
6363
path: ${{ env.SDK_BUILD_CACHE_DIR }}
6464
key: native-modules-${{ github.sha }}
@@ -70,21 +70,21 @@ runs:
7070
shell: bash
7171

7272
- name: Archive OSX artifact
73-
uses: actions/upload-artifact@v3
73+
uses: actions/upload-artifact@v4
7474
with:
7575
name: mobilesdk-${{ inputs.vtag }}-osx
7676
path: |
7777
dist/mobilesdk-*-osx.zip
7878
7979
- name: Archive win32 artifact
80-
uses: actions/upload-artifact@v3
80+
uses: actions/upload-artifact@v4
8181
with:
8282
name: mobilesdk-${{ inputs.vtag }}-win32
8383
path: |
8484
dist/mobilesdk-*-win32.zip
8585
8686
- name: Archive Linux artifact
87-
uses: actions/upload-artifact@v3
87+
uses: actions/upload-artifact@v4
8888
with:
8989
name: mobilesdk-${{ inputs.vtag }}-linux
9090
path: |
@@ -98,7 +98,7 @@ runs:
9898
rm -f ~/.gradle/caches/modules-2/gc.properties
9999
shell: bash
100100

101-
- uses: geekyeggo/delete-artifact@v2
101+
- uses: geekyeggo/delete-artifact@v5
102102
with:
103103
name: |
104104
android-build

.github/workflows/backport.yml

-19
This file was deleted.

.github/workflows/build.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
USE_CCACHE: 1
1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121
- name: Android build
2222
uses: ./.github/actions/build-android
2323
with:
24-
node-version: '16.x'
25-
java-version: '11'
24+
node-version: '20.x'
25+
java-version: '17'
2626

2727
ios:
2828
runs-on: macos-13
@@ -33,27 +33,27 @@ jobs:
3333
DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737
with:
3838
fetch-depth: 0
3939
- name: iOS build
4040
uses: ./.github/actions/build-ios
4141
with:
42-
node-version: '16.x'
42+
node-version: '20.x'
4343

4444
js:
4545
runs-on: ubuntu-latest
4646
name: JavaScript
4747
steps:
4848
- name: Checkout repository
49-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
5050
with:
5151
fetch-depth: 0
5252

53-
- name: Use Node.js 16.x
54-
uses: actions/setup-node@v3
53+
- name: Use Node.js
54+
uses: actions/setup-node@v4
5555
with:
56-
node-version: '16.x'
56+
node-version: '20.x'
5757
cache: 'npm'
5858

5959
- name: Install dependencies
@@ -71,7 +71,7 @@ jobs:
7171
needs: [android, ios, js]
7272
steps:
7373
- name: Checkout repository
74-
uses: actions/checkout@v3
74+
uses: actions/checkout@v4
7575
with:
7676
fetch-depth: 0
7777
- name: Create version tag
@@ -83,6 +83,6 @@ jobs:
8383
- name: Package
8484
uses: ./.github/actions/package
8585
with:
86-
node-version: '16.x'
87-
java-version: '11'
86+
node-version: '20.x'
87+
java-version: '17'
8888
vtag: ${{ env.vtag }}

.github/workflows/cla.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
name: Verify contributor
99

1010
steps:
11-
- uses: tidev/tidev-cla-action@v1
11+
- uses: tidev/tidev-cla-action@v2
1212
with:
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docs.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
name: Docs
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
19-
- name: Use Node.js 16.x
20-
uses: actions/setup-node@v3
19+
- name: Use Node.js
20+
uses: actions/setup-node@v4
2121
with:
22-
node-version: '16.x'
22+
node-version: '20.x'
2323
cache: 'npm'
2424
- run: npm ci
2525
name: Install dependencies

.github/workflows/regen-builds.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Regen Builds
22
on:
3-
release:
4-
types: [published, released]
53
workflow_run:
64
workflows: [Build]
75
types: [completed]
@@ -17,7 +15,7 @@ jobs:
1715
steps:
1816
- name: Repository Dispatch
1917
if: github.event.workflow_run.conclusion == 'success'
20-
uses: peter-evans/repository-dispatch@v2
18+
uses: peter-evans/repository-dispatch@v3
2119
with:
2220
event-type: regen-builds
2321
repository: tidev/downloads-www

.github/workflows/regen-docs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020

2121
- name: Setup node
22-
uses: actions/setup-node@v3
22+
uses: actions/setup-node@v4
2323
with:
2424
node-version: '16'
2525
registry-url: 'https://registry.npmjs.org'
@@ -32,7 +32,7 @@ jobs:
3232
name: Lint
3333

3434
- name: Repository Dispatch
35-
uses: peter-evans/repository-dispatch@v2
35+
uses: peter-evans/repository-dispatch@v3
3636
with:
3737
event-type: regen-api-docs
3838
token: ${{ secrets.REGEN_DOCS_GITHUB_TOKEN }}

0 commit comments

Comments
 (0)