Skip to content

Commit f19d5a7

Browse files
Nathanael AndersonNathanael Anderson
Nathanael Anderson
and
Nathanael Anderson
authored
chore: 7.0.2-RC.1 changes (#66)
* chore: RC1 changes * chore: RC1 changes * Update Package JSON to be RC.1 * Update to be dynamically allocated line numbers Co-authored-by: Nathanael Anderson <[email protected]>
1 parent 669ca33 commit f19d5a7

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ V8StackTraceId::V8StackTraceId(StringView json)
151151
V8DebuggerId debuggerId(s);
152152
if (!debuggerId.isValid()) return;
153153
if (!dict->getBoolean(kShouldPause, &should_pause)) return;
154-
id = parsedId;
154+
id = (unsigned int)parsedId;
155155
debugger_id = debuggerId.pair();
156156
}
157157

NativeScript/inspector/utils.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#include "include/v8-inspector.h"
55
#include "src/inspector/protocol/Protocol.h"
66
#include <vector>
7+
#include <cmath>
8+
#include <cstdio>
79

810
namespace v8_inspector {
911

@@ -22,8 +24,15 @@ static std::unique_ptr<protocol::Array<T>> fromValue(protocol::Value* value, pro
2224

2325
std::unique_ptr<protocol::Array<T>> result(new protocol::Array<T>());
2426
errors->Push();
27+
28+
// This (log10) will return the max number of digits(-1) in the length of the array that we have to worry about, +1 for the null
29+
int sizeArray = log10(array->size()) + 2;
30+
2531
for (size_t i = 0; i < array->size(); ++i) {
26-
const char* name = std::to_string(i).c_str();
32+
// Convert array index to a string value
33+
char* name = new char[sizeArray];
34+
sprintf(name, "%lu", i);
35+
2736
errors->SetName(name);
2837
std::unique_ptr<T> item = protocol::ValueConversions<T>::fromValue(array->at(i), errors);
2938
result->push_back(std::move(item));

metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ResolveGlobalNamesCollisionsFilter {
3737
for (auto& mptr : v) {
3838
auto& module = *mptr;
3939
std::pair<clang::Module*, std::vector<Meta*> > modulePair(module.first, std::vector<Meta*>());
40-
for (const std::pair<std::string, std::vector<Meta*> >& metas : module.second) {
40+
for (const std::pair<std::string, std::vector<Meta*> > metas : module.second) {
4141
assert(metas.second.size() == 1);
4242
for (Meta* meta : metas.second) {
4343
modulePair.second.push_back(meta);

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@nativescript/ios",
33
"description": "NativeScript Runtime for iOS",
4-
"version": "7.0.0",
4+
"version": "7.0.2-rc.1",
55
"keywords": [
66
"NativeScript",
77
"iOS",
88
"runtime"
99
],
1010
"repository": {
1111
"type": "git",
12-
"url": "https://github.com/NativeScript/ios-runtime"
12+
"url": "https://github.com/NativeScript/ns-v8ios-runtime"
1313
},
1414
"author": {
1515
"name": "NativeScript Team",

project-template/internal/nativescript-build.xcconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ LDPLUSPLUS = $SRCROOT/internal/nsld.sh
1919
// TNS_DEBUG_METADATA_PATH = $(SRCROOT)/debug-metadata
2020

2121
// Xcode 12
22-
EXCLUDED_ARCHS__PLATFORM_NAME_iphonesimulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8
23-
EXCLUDED_ARCHS=$(EXCLUDED_ARCHS__PLATFORM_NAME_$(PLATFORM_NAME)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))
22+
EXCLUDED_ARCHS_x86_64 = arm64 arm64e
23+
EXCLUDED_ARCHS[sdk=iphonesimulator*] = i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT))
24+
EXCLUDED_ARCHS[sdk=iphoneos*] = i386 armv6 armv7 armv7s armv8 x86_64

0 commit comments

Comments
 (0)