Merge branch 'master' into release

Author: petekanev

CHANGELOG.md

@@ -1,3 +1,25 @@
+3.0.1
+==
+
+## Bug Fixes
+
+ - [--debug-brk flag not working (#2741)](https://github.com/NativeScript/nativescript-cli/issues/2741)
+ 
+3.0.0
+==
+
+## What's New
+
+ - [Chrome DevTools Network Domain (#715)](https://github.com/NativeScript/android-runtime/issues/715)
+ - [Chrome DevTools Scope Tab (#713)](https://github.com/NativeScript/android-runtime/issues/713)
+ - [Enabling java source code or direct dex generation #663)](https://github.com/NativeScript/android-runtime/issues/663)
+ - [Improve Gradle incremental build (#562)](https://github.com/NativeScript/android-runtime/issues/562)
+
+
+## Bug Fixes
+
+ - [Javascript array not marshalling to Java long[] properly  (#696)](https://github.com/NativeScript/android-runtime/issues/696)
+ 
 2.5.0-RC
 ==
 

android-static-binding-generator/project/staticbindinggenerator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java

@@ -46,32 +46,31 @@ public Generator(String outputDir, String[] libs, boolean throwOnError) throws I
     }
 
 
-    public void writeBindings(String filename) throws IOException {
+    public void writeBindings(String filename) throws IOException, ClassNotFoundException {
         Binding[] bindings = generateBindings(filename);
         List<File> writenFiles = new ArrayList<File>();
         for (Binding b : bindings) {
-            if(!writenFiles.contains(b.getFile())) {
+            if (!writenFiles.contains(b.getFile())) {
                 writenFiles.add(b.getFile());
                 try (PrintStream ps = new PrintStream(b.getFile())) {
                     ps.append(b.getContent());
                 }
-            }
-            else {
+            } else {
                 throw new IOException("File already exists. This may lead to undesired behavior.\nPlease change the name of one of the extended classes.\n" + b.getFile());
             }
         }
     }
 
-    public Binding[] generateBindings(String filename) throws IOException {
+    public Binding[] generateBindings(String filename) throws IOException, ClassNotFoundException {
         List<DataRow> rows = getRows(filename);
 
         Binding[] generatedFiles = processRows(rows);
 
         return generatedFiles;
     }
 
-    public Binding generateBinding(DataRow dataRow, HashSet interfaceNames) {
-        JavaClass clazz = classes.get(dataRow.getBaseClassname());
+    public Binding generateBinding(DataRow dataRow, HashSet interfaceNames) throws ClassNotFoundException {
+        JavaClass clazz = getClass(dataRow.getBaseClassname());
 
         boolean hasSpecifiedName = !dataRow.getFilename().isEmpty();
         String packageName = hasSpecifiedName ? getBaseDir(dataRow.getFilename()) : (DEFAULT_PACKAGE_NAME + "." + clazz.getPackageName());
@@ -112,7 +111,7 @@ public Binding generateBinding(DataRow dataRow, HashSet interfaceNames) {
         return new Binding(new File(baseDir, normalizedName + JAVA_EXT), w.toString(), classname);
     }
 
-    public Binding generateBinding(DataRow dataRow) {
+    public Binding generateBinding(DataRow dataRow) throws ClassNotFoundException {
         return generateBinding(dataRow, new HashSet());
     }
 
@@ -134,7 +133,7 @@ private List<DataRow> getRows(String filename) throws IOException {
         return rows;
     }
 
-    private Binding[] processRows(List<DataRow> rows) throws IOException {
+    private Binding[] processRows(List<DataRow> rows) throws IOException, ClassNotFoundException {
         ArrayList<Binding> bindings = new ArrayList<>();
         HashSet interfaceNames = new HashSet();
 
@@ -184,11 +183,11 @@ private String getNormalizedName(String filename) {
             char c = Character.isJavaIdentifierPart(ch) ? ch : '_';
             sb.append(c);
         }
-        String name = sb.toString();
-        return name;
+
+        return sb.toString();
     }
 
-    private Map<String, List<Method>> getPublicApi(JavaClass clazz) {
+    private Map<String, List<Method>> getPublicApi(JavaClass clazz) throws ClassNotFoundException {
         Map<String, List<Method>> api = new HashMap<String, List<Method>>();
         JavaClass currentClass = clazz;
         String clazzName = clazz.getClassName();
@@ -240,7 +239,7 @@ private Map<String, List<Method>> getPublicApi(JavaClass clazz) {
                 break;
             } else {
                 String superClassName = currentClass.getSuperclassName();
-                currentClass = classes.get(superClassName.replace('$', '.'));
+                currentClass = getClass(superClassName);
             }
         }
         return api;
@@ -329,7 +328,7 @@ private String getFullMethodSignature(Method m) {
         return sig;
     }
 
-    private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String packageName, String name) {
+    private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String packageName, String name) throws ClassNotFoundException {
         String[] implInterfaces = dataRow.getInterfaces();
         collectImplementedInterfaces(implInterfaces, clazz);
 
@@ -382,12 +381,12 @@ private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String pac
             }
         }
 
-        boolean hasInitMethod2 = isApplicationClass ? false : hasInitMethod;
+        boolean hasInitMethod2 = !isApplicationClass && hasInitMethod;
         writeConstructors(clazz, name, hasInitMethod2, isApplicationClass, w);
 
         if (isInterface) {
             Set<String> objectMethods = new HashSet<String>();
-            for (Method objMethod : classes.get("java.lang.Object").getMethods()) {
+            for (Method objMethod : getClass("java.lang.Object").getMethods()) {
                 if (!objMethod.isStatic() && (objMethod.isPublic() || objMethod.isProtected())) {
                     String sig = getFullMethodSignature(objMethod);
                     objectMethods.add(sig);
@@ -408,7 +407,7 @@ private void writeBinding(Writer w, DataRow dataRow, JavaClass clazz, String pac
             }
             while (!interfaceNames.isEmpty()) {
                 String iname = interfaceNames.pollFirst();
-                JavaClass iface = classes.get(iname.replace('$', '.'));
+                JavaClass iface = getClass(iname);
                 for (String iname2 : iface.getInterfaceNames()) {
                     interfaceNames.add(iname2.replace('$', '.'));
                 }
@@ -528,7 +527,6 @@ private void writeMethodSignature(Method m, Writer w) {
     private void writeThrowsClause(Method m, Writer w) {
     }
 
-
     private void writeConstructors(JavaClass clazz, String classname, boolean hasInitMethod, boolean isApplicationClass, Writer w) {
         boolean isInterface = clazz.isInterface();
         if (isInterface) {
@@ -656,7 +654,7 @@ private void writeType(Type t, Writer w) {
         w.write(type);
     }
 
-    private void collectInterfaceMethods(JavaClass clazz, List<Method> methods) {
+    private void collectInterfaceMethods(JavaClass clazz, List<Method> methods) throws ClassNotFoundException {
         JavaClass currentClass = clazz;
 
         while (true) {
@@ -669,7 +667,7 @@ private void collectInterfaceMethods(JavaClass clazz, List<Method> methods) {
 
             while (!queue.isEmpty()) {
                 String ifaceName = queue.poll();
-                JavaClass currentInterface = classes.get(ifaceName.replace('$', '.'));
+                JavaClass currentInterface = getClass(ifaceName);
                 Method[] ifaceMethods = currentInterface.getMethods();
                 for (Method m : ifaceMethods) {
                     methods.add(m);
@@ -683,12 +681,12 @@ private void collectInterfaceMethods(JavaClass clazz, List<Method> methods) {
                 break;
             } else {
                 String superClassName = currentClass.getSuperclassName();
-                currentClass = classes.get(superClassName.replace('$', '.'));
+                currentClass = getClass(superClassName);
             }
         }
     }
 
-    private boolean isApplicationClass(JavaClass clazz, Map<String, JavaClass> classes) {
+    private boolean isApplicationClass(JavaClass clazz, Map<String, JavaClass> classes) throws ClassNotFoundException {
         boolean isApplicationClass = false;
 
         String applicationClassname = "android.app.Application";
@@ -707,9 +705,19 @@ private boolean isApplicationClass(JavaClass clazz, Map<String, JavaClass> class
             }
 
             String superClassName = currentClass.getSuperclassName();
-            currentClass = classes.get(superClassName.replace('$', '.'));
+            currentClass = getClass(superClassName);
         }
 
         return isApplicationClass;
     }
+
+    private JavaClass getClass(String className) throws ClassNotFoundException {
+        JavaClass clazz = classes.get(className.replace('$', '.'));
+
+        if (clazz == null) {
+            throw new ClassNotFoundException("Class: " + className);
+        }
+
+        return clazz;
+    }
 }

android-static-binding-generator/project/staticbindinggenerator/src/main/java/org/nativescript/staticbindinggenerator/Main.java

@@ -4,14 +4,14 @@
 import java.util.Arrays;
 
 public class Main {
-    public static void main(String[] args) throws IOException {
-            if (args.length < 3) {
-                throw new IllegalArgumentException("Expects at least three arguments");
-            }
-            String inputBindingFilename = args[0];
-            String outputDir = args[1];
-            String[] libs = Arrays.copyOfRange(args, 2, args.length);
+    public static void main(String[] args) throws IOException, ClassNotFoundException {
+        if (args.length < 3) {
+            throw new IllegalArgumentException("Expects at least three arguments");
+        }
+        String inputBindingFilename = args[0];
+        String outputDir = args[1];
+        String[] libs = Arrays.copyOfRange(args, 2, args.length);
 
-            new Generator(outputDir, libs).writeBindings(inputBindingFilename);
+        new Generator(outputDir, libs).writeBindings(inputBindingFilename);
     }
 }

build-artifacts/project-template-gradle/src/main/java/com/tns/RuntimeHelper.java

@@ -6,6 +6,7 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build;
 import android.util.Log;
+
 import java.io.IOException;
 
 public final class RuntimeHelper {
@@ -28,7 +29,7 @@ private static boolean hasErrorIntent(Application app) {
                 try {
                     java.lang.Class ErrReport = java.lang.Class.forName("com.tns.ErrorReport");
                     java.lang.reflect.Field field = ErrReport.getDeclaredField("ERROR_FILE_NAME");
-                    fileName = (String)field.get(null);
+                    fileName = (String) field.get(null);
                 } catch (Exception e) {
                     return false;
                 }
@@ -97,7 +98,7 @@ public static Runtime initRuntime(Application app) {
                         logger.write("Extracting snapshot blob");
                     }
 
-                    aE.extractAssets(app,  "snapshots/" + Build.CPU_ABI, outputDir, extractPolicy);
+                    aE.extractAssets(app, "snapshots/" + Build.CPU_ABI, outputDir, extractPolicy);
                 }
 
                 extractPolicy.setAssetsThumb(app);
@@ -131,17 +132,32 @@ public static Runtime initRuntime(Application app) {
             runtime = Runtime.initializeRuntimeWithConfiguration(config);
             if (isDebuggable) {
                 try {
-                    v8Inspector = new AndroidJsV8Inspector(app, logger);
+                    v8Inspector = new AndroidJsV8Inspector(app.getFilesDir().getAbsolutePath(), app.getPackageName());
                     v8Inspector.start();
 
                     // the following snippet is used as means to notify the VSCode extension
                     // debugger that the debugger agent has started
-                    File debugBreakFile = new File("/data/local/tmp", app.getPackageName() + "-debugger-started");
+                    File debuggerStartedFile = new File("/data/local/tmp", app.getPackageName() + "-debugger-started");
+                    if (debuggerStartedFile.exists() && !debuggerStartedFile.isDirectory() && debuggerStartedFile.length() == 0) {
+                        java.io.FileWriter fileWriter = new java.io.FileWriter(debuggerStartedFile);
+                        fileWriter.write("started");
+                        fileWriter.close();
+                    }
+
+                    // check if --debug-brk flag has been set. If positive:
+                    // write to the file to invalidate the flag
+                    // inform the v8Inspector to pause the main thread
+                    File debugBreakFile = new File("/data/local/tmp", app.getPackageName() + "-debugbreak");
+                    boolean shouldBreak = false;
                     if (debugBreakFile.exists() && !debugBreakFile.isDirectory() && debugBreakFile.length() == 0) {
                         java.io.FileWriter fileWriter = new java.io.FileWriter(debugBreakFile);
                         fileWriter.write("started");
                         fileWriter.close();
+
+                        shouldBreak = true;
                     }
+
+                    v8Inspector.waitForDebugger(shouldBreak);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "files": [
     "**/*"
   ]