Merge branch 'master' into vmutafov/merge-release-to-master

Author: vmutafov

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/android-runtime.git"
@@ -11,7 +11,7 @@
   ],
   "gradle": {
     "version": "5.1.1",
-    "android": "3.4.1"
+    "android": "3.4.2"
   },
   "android_ndk_version": "19c"
 }

test-app/build-tools/android-metadata-generator/build.gradle

@@ -17,7 +17,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 

test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/generating/writing/impl/MethodsWriterImpl.java

@@ -389,6 +389,12 @@ public void writeInternalServiceOnCreateMethod() {
         writer.write(INTERNAL_SERVICES_ONCREATE_METHOD_SIGNATURE);
         writer.write(OPENING_CURLY_BRACKET_LITERAL);
 
+        writer.write(SUPER_METHOD_CALL_PREFIX);
+        writer.write(ON_CREATE_METHOD_NAME);
+        writer.write(OPENING_ROUND_BRACKET_LITERAL);
+        writer.write(CLOSING_ROUND_BRACKET_LITERAL);
+        writer.write(END_OF_STATEMENT_LITERAL);
+
         writeRuntimeInitializationForService();
 
         writer.write(CLOSING_CURLY_BRACKET_LITERAL);

test-app/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 

test-app/runtime/src/main/cpp/v8_inspector/src/inspector/utils/v8-inspector-common.cpp

@@ -3,6 +3,8 @@
 //
 
 #include <v8_inspector/src/inspector/utils/v8-inspector-common.h>
+#include <codecvt>
+#include <locale>
 #include <ArgConverter.h>
 #include <NativeScriptAssert.h>
 
@@ -39,6 +41,16 @@ protocol::DispatchResponse Common::protocolCommandNotSupportedDispatchResponse()
     return protocol::DispatchResponse::Error(s_notImplemented);
 }
 
+std::vector<uint16_t> Common::toVector(const std::string &value) {
+    std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
+    std::u16string valueu16 = convert.from_bytes(value);
+
+    const uint16_t *begin = reinterpret_cast<uint16_t const *>(valueu16.data());
+    const uint16_t *end = reinterpret_cast<uint16_t const *>(valueu16.data() + valueu16.size());
+    std::vector<uint16_t> vector(begin, end);
+    return vector;
+}
+
 const String16 Common::s_notImplemented = "Protocol command not supported.";
 }
 }

test-app/runtime/src/main/cpp/v8_inspector/src/inspector/utils/v8-inspector-common.h

@@ -18,6 +18,8 @@ class Common {
 
         static protocol::DispatchResponse protocolCommandNotSupportedDispatchResponse();
 
+        static std::vector<uint16_t> toVector(const std::string& value);
+
     private:
         static const String16 s_notImplemented;
 };

test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-log-agent-impl.cpp

@@ -71,7 +71,8 @@ void V8LogAgentImpl::EntryAdded(const std::string& text, std::string verbosityLe
     auto nano = std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now());
     double timestamp = nano.time_since_epoch().count();
 
-    auto textString16 = String16(text.data());
+    auto vector = utils::Common::toVector(text);
+    auto textString16 = String16(vector.data(), vector.size());
 
     auto logEntry = protocol::Log::LogEntry::create()
                     .setSource(protocol::Log::LogEntry::SourceEnum::Javascript)

v8-versions.json

@@ -1,5 +1,5 @@
 {
-    ">=5.9.9 <6.1.0": "7.5.288.22",
+    ">=5.9.9 <6.2.0": "7.5.288.22",
     ">=5.3.9 <5.9.0": "7.4.288.25",
     ">=5.2.9 <5.4.0": "7.3.492.25",
     ">=5.1.9 <5.3.0": "7.1.302.32",