Merge branch 'master' into trifonov/inspector-improvements

Author: vtrifonov

package.json

@@ -11,7 +11,7 @@
   ],
   "gradle": {
     "version": "4.10.2",
-    "android": "3.2.1"
+    "android": "3.3.0"
   },
   "android_ndk_version": "18b"
 }

test-app/app/src/debug/java/com/tns/NativeScriptSyncServiceSocketImpl.java

@@ -165,7 +165,7 @@ public void run() {
 
                         validateData();
                         if(runtime != null && doRefreshInt == DO_REFRESH_VALUE) {
-                            runtime.runScript(new File(NativeScriptSyncServiceSocketImpl.this.context.getFilesDir(), "internal/livesync.js"));
+                            runtime.runScript(new File(NativeScriptSyncServiceSocketImpl.this.context.getFilesDir(), "internal/livesync.js"), false);
                             operationReportCode = OPERATION_END_REPORT_CODE;
                         } else {
                             operationReportCode = OPERATION_END_NO_REFRESH_REPORT_CODE;

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

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

test-app/build.gradle

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

test-app/runtime/src/main/java/com/tns/Runtime.java

@@ -590,6 +590,10 @@ public void runModule(File jsFile) throws NativeScriptException {
     }
 
     public Object runScript(File jsFile) throws NativeScriptException {
+        return this.runScript(jsFile, true);
+    }
+
+    public Object runScript(File jsFile, final boolean waitForResultOnMainThread) throws NativeScriptException {
         Object result = null;
 
         if (jsFile.exists() && jsFile.isFile()) {
@@ -621,7 +625,7 @@ public void run() {
                 if (success) {
                     synchronized (r) {
                         try {
-                            if (arr[1] == null) {
+                            if (arr[1] == null && waitForResultOnMainThread) {
                                 r.wait();
                             }
                         } catch (InterruptedException e) {