Skip to content

Commit 53d5f3e

Browse files
m1gam1ga
authored
Merge branch 'main' into androidVectorDrawable
2 parents 8458f86 + 8200206 commit 53d5f3e

File tree

379 files changed

+1440
-3105
lines changed

Some content is hidden

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

379 files changed

+1440
-3105
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
USE_CCACHE: 1
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 0
2222
- name: Android build
@@ -34,7 +34,7 @@ jobs:
3434
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
3535
steps:
3636
- name: Checkout repository
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v6
3838
with:
3939
fetch-depth: 0
4040
- name: iOS build
@@ -47,7 +47,7 @@ jobs:
4747
name: JavaScript
4848
steps:
4949
- name: Checkout repository
50-
uses: actions/checkout@v4
50+
uses: actions/checkout@v6
5151
with:
5252
fetch-depth: 0
5353

@@ -72,7 +72,7 @@ jobs:
7272
needs: [android, ios, js]
7373
steps:
7474
- name: Checkout repository
75-
uses: actions/checkout@v4
75+
uses: actions/checkout@v6
7676
with:
7777
fetch-depth: 0
7878
- name: Create version tag

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Docs
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
with:
1818
fetch-depth: 0
1919
- name: Use Node.js

‎.github/workflows/regen-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 0
2222

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
vtag: ${{ steps.vtag.outputs.vtag }}
3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v6
3535
with:
3636
fetch-depth: 0
3737
ref: ${{ github.event.inputs.branch }}
@@ -70,7 +70,7 @@ jobs:
7070
USE_CCACHE: 1
7171
steps:
7272
- name: Checkout repository
73-
uses: actions/checkout@v4
73+
uses: actions/checkout@v6
7474
with:
7575
fetch-depth: 0
7676
ref: ${{ github.event.inputs.branch }}
@@ -90,7 +90,7 @@ jobs:
9090
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
9191
steps:
9292
- name: Checkout repository
93-
uses: actions/checkout@v4
93+
uses: actions/checkout@v6
9494
with:
9595
fetch-depth: 0
9696
ref: ${{ github.event.inputs.branch }}
@@ -109,7 +109,7 @@ jobs:
109109
needs: [validate, android, ios]
110110
steps:
111111
- name: Checkout repository
112-
uses: actions/checkout@v4
112+
uses: actions/checkout@v6
113113
with:
114114
fetch-depth: 0
115115
ref: ${{ github.event.inputs.branch }}
@@ -129,7 +129,7 @@ jobs:
129129
vtag: ${{ needs.validate.outputs.vtag }}
130130
steps:
131131
- name: Checkout repository
132-
uses: actions/checkout@v4
132+
uses: actions/checkout@v6
133133
with:
134134
fetch-depth: 0
135135
ref: ${{ github.event.inputs.branch }}
@@ -138,7 +138,7 @@ jobs:
138138
uses: actions/download-artifact@v4
139139
with:
140140
name: mobilesdk-${{ env.vtag }}-linux
141-
- name: Download MacOS artifact
141+
- name: Download macOS artifact
142142
uses: actions/download-artifact@v4
143143
with:
144144
name: mobilesdk-${{ env.vtag }}-osx

‎.github/workflows/sponsors.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Update Sponsors
1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414
with:
1515
fetch-depth: 0
1616
- name: Update Sponsors in README.md

‎MIGRATION_GUIDE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ The following APIs were removed in 9.0.0:
127127
| `Ti.UI.View#finishLayout()` | Use the `#applyProperties()` method to batch-update layout properties. |
128128
| `Ti.UI.View#startLayout()` | Use the `#applyProperties()` method to batch-update layout properties. |
129129
| `Ti.UI.View#updateLayout()` | Use the `#applyProperties()` method to batch-update layout properties. |
130-
| `Ti.UI.WebView.error.message` | Use the `error` property instead. Removed on ios in 8.0.0. Removed on android in 9.0.0. |
131-
| `Ti.UI.WebView.error.errorCode` | Use the `code` property instead. Removed on ios in 8.0.0. Removed on android in 9.0.0. |
130+
| `Ti.UI.WebView.error.message` | Use the `error` property instead. Removed on iOS in 8.0.0. Removed on Android in 9.0.0. |
131+
| `Ti.UI.WebView.error.errorCode` | Use the `code` property instead. Removed on iOS in 8.0.0. Removed on Android in 9.0.0. |
132132
| `Ti.UI.WebView.onStopBlacklistedUrl` | Use the cross-platform `blacklisturl` event instead. |
133133
| `Ti.UI.Window.android:back` | Use the `Ti.UI.Window.androidback` event instead. |
134134
| `Ti.UI.Window.android:camera` | Use the `Ti.UI.Window.androidcamera` event instead. |

‎README.md‎

Lines changed: 71 additions & 72 deletions
Large diffs are not rendered by default.

‎STARTUP.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ At SDK build time, `./android/titanium/prebuild.js` script is run which takes JS
1515
- then call...
1616

1717
`V8Runtime#nativeInit()`
18-
- from java down to JNI
18+
- from Java down to JNI
1919
- sets up platform, isolate, debugger, then calls...
2020
`V8Runtime#bootstrap()`
2121
- sets up `EventEmitter` in C code
@@ -40,7 +40,7 @@ back to `V8Runtime#bootstrap()`
4040
- set up `global.global`
4141
- set default `global.__dirname` and `__filename`
4242

43-
back to java `V8Runtime#initRuntime()`
43+
back to Java `V8Runtime#initRuntime()`
4444
- start debugger
4545
- load external native modules
4646

‎android/.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SpacesInParentheses: false
2121
TabWidth: 4
2222
UseTab: ForContinuationAndIndentation
2323
SpaceAfterCStyleCast: true
24-
# Spaces inside {} for array literals, i.e. "new Object[] { args }"
24+
# Spaces inside {} for array literals, e.g. "new Object[] { args }"
2525
Cpp11BracedListStyle: false
2626
ReflowComments: false
2727
JavaImportGroups: ['java', 'javax', 'org', 'android', 'com']

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ tasks.register('checkstyleChanged', Checkstyle) {
5555
include getChangedFiles()
5656
}
5757

58-
// Used to strip the src dir prefixes from the changed java files
58+
// Used to strip the src dir prefixes from the changed Java files
5959
def getChangedFiles() {
6060
if (!project.hasProperty('changedFiles')) {
6161
return new ArrayList<>()

0 commit comments

Comments
 (0)