Skip to content

Commit 464a8a4

Browse files
committed
hermes: update to hermes v1
1 parent 62cfaaa commit 464a8a4

Some content is hidden

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

65 files changed

+15619
-618
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
"stdlib.h": "c",
8181
"assert.h": "c",
8282
"js_native_api.h": "c",
83-
"javascriptcore.h": "c"
83+
"javascriptcore.h": "c",
84+
"codecvt": "cpp"
8485
},
8586
"cmake.sourceDirectory": "/Volumes/DataDrive/Android/android-runtime/test-app/runtime"
8687
}

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ def hasNdkVersion = project.hasProperty("ndkVersion")
2020

2121
def hasHostObjects = project.hasProperty("useHostObjects")
2222

23+
def asNapiModule = project.hasProperty("asNapiModule")
24+
2325
if (hasNdkVersion) {
2426
println "Using NDK version " + ndkVersion
2527
}
@@ -213,6 +215,10 @@ def getAssembleReleaseBuildArguments = { ->
213215
arguments.add("-PuseHostObjects")
214216
}
215217

218+
if (asNapiModule) {
219+
arguments.add("-PasNapiModule")
220+
}
221+
216222
arguments += ["--warning-mode", "all"]
217223

218224
return arguments

test-app/.idea/caches/deviceStreaming.xml

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

test-app/.idea/deploymentTargetSelector.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"kotlinUsage": {
3-
"hasUseKotlinPropertyInApp": true,
4-
"hasKotlinRuntimeClasses": false
5-
}
2+
"kotlinUsage": {
3+
"hasUseKotlinPropertyInApp": true,
4+
"hasKotlinRuntimeClasses": true
5+
}
66
}

test-app/app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ def computeNamespace = { ->
214214
}
215215

216216
android {
217+
217218
namespace computeNamespace()
218219

219220
applyBeforePluginGradleConfiguration()
@@ -350,7 +351,7 @@ dependencies {
350351
}
351352

352353
if (ns_engine == "HERMES") {
353-
implementation 'com.facebook.fbjni:fbjni:0.3.0'
354+
implementation 'com.facebook.fbjni:fbjni:0.7.0'
354355
}
355356

356357
def androidXMaterialVersion = "${ns_default_androidx_material_version}"

test-app/app/src/main/assets/app/Infrastructure/Jasmine/jasmine-2.0.1/boot.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ var TerminalReporter = require('../jasmine-reporters/terminal_reporter').Termina
4141

4242
it: function(desc, func) {
4343
// if (global.__engine === "QuickJS") {
44-
// if (func.length > 0) {
45-
// return env.it(desc, func);
46-
// } else {
47-
// return env.it(desc, function(done) {
48-
// func();
49-
// __ns__setTimeout(() => {
50-
// done();
51-
// }, 1)
52-
//
53-
// })
54-
// }
44+
if (func.length > 0) {
45+
return env.it(desc, func);
46+
} else {
47+
return env.it(desc, function(done) {
48+
func();
49+
__ns__setTimeout(() => {
50+
done();
51+
}, 1)
52+
53+
})
54+
}
5555
// } else {
56-
return env.it(desc, func);
56+
// return env.it(desc, func);
5757
// }
5858
},
5959

test-app/app/src/main/assets/app/tests/testRuntimeImplementedAPIs.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ describe("Runtime exposes", function () {
1818
var timeEnd = __time();
1919
var dateDelta = dateTimeEnd - dateTimeStart;
2020
var timeDelta = timeEnd - timeStart;
21-
expect(Math.abs(dateDelta - timeDelta) < dateDelta * 0.25).toBe(true);
21+
22+
expect(Math.abs(dateDelta - timeDelta) <= dateDelta * 0.25).toBe(true);
2223
break;
2324
} catch(e) {
2425
if (i == 9) {

test-app/app/src/main/assets/internal/ts_helpers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
}
205205

206206
global.setNativeArrayProp = (target, prop, value, receiver) => {
207-
if (!isNaN(prop)) {
207+
if (typeof prop !== "symbol" && !isNaN(prop)) {
208208
receiver.setValueAtIndex(parseInt(prop), value);
209209
return true;
210210
}
@@ -213,7 +213,7 @@
213213
};
214214

215215
global.getNativeArrayProp = (target, prop, receiver) => {
216-
if (!isNaN(prop)) {
216+
if (typeof prop !== "symbol" && !isNaN(prop)) {
217217
return receiver.getValueAtIndex(parseInt(prop));
218218
}
219219

Binary file not shown.

0 commit comments

Comments
 (0)