Skip to content

chore: 7.0.2-RC.1 changes #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 17, 2020
Merged

chore: 7.0.2-RC.1 changes #66

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70f5f5d
chore: RC1 changes
Oct 10, 2020
4517d73
chore: RC1 changes
NathanaelA Oct 10, 2020
34fbd0c
Merge branch 'RC1_Changes' of github.com:NativeScript/ns-v8ios-runtim…
NathanaelA Oct 10, 2020
fb0e9fb
Update Package JSON to be RC.1
NathanaelA Oct 11, 2020
26566f7
Update to be dynamically allocated line numbers
NathanaelA Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NativeScript/inspector/src/inspector/v8-stack-trace-impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ V8StackTraceId::V8StackTraceId(StringView json)
V8DebuggerId debuggerId(s);
if (!debuggerId.isValid()) return;
if (!dict->getBoolean(kShouldPause, &should_pause)) return;
id = parsedId;
id = (unsigned int)parsedId;
debugger_id = debuggerId.pair();
}

Expand Down
3 changes: 2 additions & 1 deletion NativeScript/inspector/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ static std::unique_ptr<protocol::Array<T>> fromValue(protocol::Value* value, pro
std::unique_ptr<protocol::Array<T>> result(new protocol::Array<T>());
errors->Push();
for (size_t i = 0; i < array->size(); ++i) {
const char* name = std::to_string(i).c_str();
auto nameStr = std::to_string(i);
const char* name = nameStr.c_str();
errors->SetName(name);
std::unique_ptr<T> item = protocol::ValueConversions<T>::fromValue(array->at(i), errors);
result->push_back(std::move(item));
Expand Down
2 changes: 1 addition & 1 deletion metadata-generator/src/Meta/Filters/ResolveGlobalNamesCollisionsFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ResolveGlobalNamesCollisionsFilter {
for (auto& mptr : v) {
auto& module = *mptr;
std::pair<clang::Module*, std::vector<Meta*> > modulePair(module.first, std::vector<Meta*>());
for (const std::pair<std::string, std::vector<Meta*> >& metas : module.second) {
for (const std::pair<std::string, std::vector<Meta*> > metas : module.second) {
assert(metas.second.size() == 1);
for (Meta* meta : metas.second) {
modulePair.second.push_back(meta);
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@nativescript/ios",
"description": "NativeScript Runtime for iOS",
"version": "7.0.0",
"version": "7.0.2-rc1",
"keywords": [
"NativeScript",
"iOS",
"runtime"
],
"repository": {
"type": "git",
"url": "https://github.com/NativeScript/ios-runtime"
"url": "https://github.com/NativeScript/ns-v8ios-runtime"
},
"author": {
"name": "NativeScript Team",
Expand Down
5 changes: 3 additions & 2 deletions project-template/internal/nativescript-build.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ LDPLUSPLUS = $SRCROOT/internal/nsld.sh
// TNS_DEBUG_METADATA_PATH = $(SRCROOT)/debug-metadata

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