Skip to content

Commit 04be917

Browse files
committed
Merge branch 'master' into gradle9Fixes
2 parents 32c2110 + 84ae716 commit 04be917

13 files changed

Lines changed: 1197 additions & 1253 deletions

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
# Hyperloop
44

5-
This repo contains source code for the Hyperloop® product.
5+
This repo contains the source code for Hyperloop, which lets you extend your Titanium SDK apps with native APIs using JavaScript.
66

77
## Building
88

99
You must have the following on your machine to build it using `build.sh`, however, you can use `./tools/build.sh` to bootstrap your environment with the necessary build tools if you do not:
1010

11-
- Titanium SDK 6.0.0 or later (from master)
12-
- Xcodebuild + iOS SDK 9.0+
11+
- Titanium SDK 12.4.0+ (iOS) / 12.7.0+ (Android)
12+
- iOS 13.0+ / Android 5.0+
1313
- grunt
1414
- Ant
1515

1616
## License
1717

1818
Hyperloop is licensed under the OSI approved Apache Public License (version 2). Please see the LICENSE file for specific details.
1919

20-
## Legal Stuff
20+
## Legal
2121

22-
Appcelerator is a registered trademark of Appcelerator, Inc. Titanium is a registered trademark of Appcelerator, Inc. Please see the LEGAL information about using our trademarks, privacy policy, terms of usage and other legal information at http://www.appcelerator.com/legal.
22+
Titanium is a registered trademark of TiDev Inc. All Titanium trademark and patent rights were transferred and assigned to TiDev Inc. on 4/7/2022. Please see the LEGAL information about using our trademarks, privacy policy, terms of usage and other legal information at https://tidev.io/legal.
723 KB
Binary file not shown.
-679 KB
Binary file not shown.
551 KB
Binary file not shown.
692 KB
Binary file not shown.

android/hooks/metabase/metabase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function generate(classPath, opts, callback) {
7171
classPath = typeof(classPath)==='string' ? [classPath] : classPath;
7272

7373
var dest = opts.dest || opts.cacheDir || 'build',
74-
cp = [path.join(__dirname, 'lib', 'bcel-6.5.0.jar'), path.join(__dirname, 'lib', 'json.jar'), dest];
74+
cp = [path.join(__dirname, 'lib', 'bcel-6.11.0.jar'), path.join(__dirname, 'lib', 'commons-lang3-3.19.0.jar'), path.join(__dirname, 'lib', 'commons-io-2.20.0.jar'), path.join(__dirname, 'lib', 'json.jar'), dest];
7575

7676
compileIfNecessary(dest, cp.join(path.delimiter), function(err){
7777
if (err) return callback(err);

android/hooks/package-lock.json

Lines changed: 140 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/hooks/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
"@babel/traverse": "^7.18.8",
1616
"@babel/types": "^7.18.8",
1717
"appc-tasks": "^1.0.3",
18-
"async": "^2.6.1",
18+
"async": "^2.6.4",
1919
"babel-preset-minify": "^0.5.0",
2020
"chalk": "^2.4.2",
21-
"ejs": "^2.6.1",
21+
"ejs": "^3.1.10",
2222
"fs-extra": "^7.0.1",
23-
"lodash": "^4.17.11",
23+
"lodash": "^4.17.21",
2424
"node-appc": "^0.2.49",
2525
"xmldom": "^0.1.27"
2626
},

android/manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ name: hyperloop-android
1515
moduleid: hyperloop
1616
guid: bdaca69f-b316-4ce6-9065-7a61e1dafa39
1717
platform: android
18-
minsdk: 12.7.0
18+
minsdk: 13.0.0

0 commit comments

Comments
 (0)