Skip to content

Commit eba52c6

Browse files
authored
Merge branch 'master' into androidGradle
2 parents eac24d3 + c026d19 commit eba52c6

File tree

173 files changed

+18677
-46367
lines changed

Some content is hidden

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

173 files changed

+18677
-46367
lines changed

.eslintrc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
{
22
"extends": [ "axway/env-node"],
33
"parserOptions": {
4-
"sourceType": "script"
4+
"sourceType": "module"
55
},
66
"rules": {
77
"no-use-before-define": ["error", { "functions": false, "classes": false, "variables": true }],
8-
"promise/catch-or-return": [ "warn", { "terminationMethod": [ "catch", "finally" ]} ]
8+
"promise/catch-or-return": [ "warn", { "terminationMethod": [ "catch", "finally" ]} ],
9+
"promise/always-return": "off",
10+
"promise/no-callback-in-promise": "off",
11+
"security/detect-child-process": "off"
912
},
1013
"overrides": [
1114
{
1215
"files": [ "android/runtime/common/src/js/**/*.js", "android/modules/**/src/js/**/*.js" ],
1316
"parserOptions": {
14-
"ecmaVersion": 2020
17+
"ecmaVersion": 2024
1518
},
1619
"globals": {
1720
"kroll": "readonly",
@@ -65,7 +68,7 @@
6568
{
6669
"files": [ "cli/lib/tasks/*.js", "cli/hooks/webpack.js", "cli/lib/webpack/**/*.js" ],
6770
"parserOptions": {
68-
"ecmaVersion": 2017,
71+
"ecmaVersion": 2020,
6972
"sourceType": "module"
7073
}
7174
}

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
CCACHE_DIR: ${{ github.workspace }}/.ccache
3232
USE_CCACHE: 1
33-
DEVELOPER_DIR: /Applications/Xcode_26.0.0.app/Contents/Developer
33+
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
3434
steps:
3535
- name: Checkout repository
3636
uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
6767
name: Package
6868
env:
6969
SDK_BUILD_CACHE_DIR: ${{ github.workspace }}/.native-modules
70-
DEVELOPER_DIR: /Applications/Xcode_26.0.0.app/Contents/Developer
70+
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
7171
needs: [android, ios, js]
7272
steps:
7373
- name: Checkout repository

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
env:
8888
CCACHE_DIR: ${{ github.workspace }}/.ccache
8989
USE_CCACHE: 1
90-
DEVELOPER_DIR: /Applications/Xcode_26.0.0.app/Contents/Developer
90+
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
9191
steps:
9292
- name: Checkout repository
9393
uses: actions/checkout@v4
@@ -104,7 +104,7 @@ jobs:
104104
name: Package
105105
env:
106106
SDK_BUILD_CACHE_DIR: ${{ github.workspace }}/.native-modules
107-
DEVELOPER_DIR: /Applications/Xcode_26.0.0.app/Contents/Developer
107+
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
108108
vtag: ${{ needs.validate.outputs.vtag }}
109109
needs: [validate, android, ios]
110110
steps:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ npm-debug.log
3232
/android/.idea/
3333

3434
# Build dirs
35+
/build/lib/test/out.txt
3536
/dist
3637
/tmp
3738

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
<h1 align="center">Titanium SDK</h1>
44

5-
<p align="center"><a href="https://github.com/tidev/titanium-sdk/actions/workflows/build.yml?query=branch%3Amaster" target="_blank"><img src="https://github.com/tidev/titanium-sdk/actions/workflows/build.yml/badge.svg?branch=master" /></a></p>
5+
<p align="center"> <a href="https://bsky.app/profile/titaniumsdk.com">
6+
<img src="https://img.shields.io/badge/Bluesky-0285FF?logo=bluesky&logoColor=fff" alt="Follow @titaniumsdk.com on Bluesky" />
7+
</a><a href="https://github.com/tidev/titanium-sdk/actions/workflows/build.yml?query=branch%3Amaster" target="_blank"><img src="https://github.com/tidev/titanium-sdk/actions/workflows/build.yml/badge.svg?branch=master" /></a></p>
68

79
Welcome to the Titanium SDK open source project. Titanium SDK provides a mature platform for developers to build
810
completely native cross-platform mobile applications using JavaScript.
@@ -232,7 +234,7 @@ npm run cleanbuild -- [platform1] [platform2] --android-sdk /opt/android-sdk /Us
232234

233235
We have a [unit test suite](tests/) intended to run across all supported platforms.
234236

235-
We have npm scripts set up to run a full clean, build, package, symlinked install, `ti sdk select` the built sdk, and then run the unit test suite:
237+
We have npm scripts set up to run a full clean, build, package, symlinked install, and then run the unit test suite:
236238

237239
```bash
238240
npm run test:android

STARTUP.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ At SDK build time, `./android/titanium/prebuild.js` script is run which takes JS
1010
`App.java`
1111
- create app info, set up encryption asset helper stuff
1212
- create asset cache
13-
- load Ti.App data into analytics class
1413
- create V8Runtime
1514
- register external modules (id -> class)
1615
- then call...
@@ -44,7 +43,7 @@ back to `V8Runtime#bootstrap()`
4443
back to java `V8Runtime#initRuntime()`
4544
- start debugger
4645
- load external native modules
47-
46+
4847
... then?
4948
- The root splash screen activity `TiLaunchActivity` calls `TiApplication.launch()` to start the JS runtime.
5049
- which eventually calls from Java -> JNI -> C to `global.Module.runModule()` (or if we have a snapshot, it does `global._startSnapshot(global)`)

0 commit comments

Comments
 (0)