Merge pull request #750 from NativeScript/release

Merge branch 'release' into master

Author: petekanev

README.md

@@ -29,11 +29,24 @@ The source in this repo is organized in Android Studio projects.
 # How to build
 
 * Run command 
-```Shell
-gradlew build
-```
+
+  Windows: 
+
+  ```Shell
+  gradlew createPackage
+  ```
+
+  Mac/Linux:
+
+  ```Shell
+  ./gradlew createPackage
+  ```
+
+* The build process includes building of the runtime package (both optimized and with unstripped v8 symbol table), as well as all supplementary tools used for the android builds: metadata-generator, binding-generator, metadata-generator, static-binding-generator
 * The result of the build will be in the dist folder.
 
+  `Note:` To cut the build time in half and package only the optimized (stripped) version of the runtime package comment out 'tasks.generateRuntimeAar.execute()' in the [build.gradle](https://github.com/NativeScript/android-runtime/blob/v3.0.0-rc.1/build.gradle#L114) script.
+
 # How to run tests
 
 * Go to subfolder test-app after you built the runtime.
@@ -42,5 +55,5 @@ gradlew build
   ``Note: Keep in mind the device or emulator needs to have an sdcard mounted.``
 * Run command
 ```Shell
-gradle runtest
+gradlew runtest
 ```

build-artifacts/project-template-gradle/build.gradle

@@ -500,7 +500,8 @@ task copyAarDependencies (type: Copy) {
 	Object[] files = Files.find(
 				Paths.get("$projectDir", "$nodeModulesDir"),
 				Integer.MAX_VALUE,
-				filterAarFilesFn
+				filterAarFilesFn,
+				java.nio.file.FileVisitOption.FOLLOW_LINKS
 			)
 			.map(mapToStringFn)
 			.toArray();

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

@@ -128,7 +128,11 @@ public void run() {
                 int length = input.readInt();
                 input.readFully(new byte[length]); // ignore the payload
                 executePartialSync(context, syncDir);
+                // delete temporary /sync dir after syncing .xml/.css resources
+                deleteRecursive(syncDir);
                 executeRemovedSync(context, removedSyncDir);
+                // delete temporary /removedsync dir after removing files from the project
+                deleteRecursive(removedSyncDir);
 
                 runtime.runScript(new File(NativeScriptSyncService.this.context.getFilesDir(), "internal/livesync.js"));
                 try {
@@ -157,7 +161,11 @@ private void deleteRecursive(File fileOrDirectory) {
             }
         }
 
-        fileOrDirectory.delete();
+        boolean success = fileOrDirectory.delete();
+
+        if (!success && fileOrDirectory.isDirectory()) {
+            android.util.Log.d("Sync", "Failed to delete temp sync directory: " + fileOrDirectory.getAbsolutePath());
+        }
     }
 
     public static boolean isSyncEnabled(Context context) {

runtime/src/main/jni/ObjectManager.cpp

@@ -460,6 +460,10 @@ void ObjectManager::MarkReachableObjects(Isolate* isolate, const Local<Object>&
             NativeScriptExtension::ReleaseClosureObjects(closureObjects);
         }
 
+        if (o->IsArray()) {
+            MarkReachableArrayElements(o, s);
+        }
+
         auto proto = o->GetPrototype();
         if (!proto.IsEmpty() && !proto->IsNull() && !proto->IsUndefined() && proto->IsObject()) {
             s.push(proto);
@@ -518,6 +522,19 @@ void ObjectManager::MarkReachableObjects(Isolate* isolate, const Local<Object>&
     } // while
 }
 
+void ObjectManager::MarkReachableArrayElements(Local<Object> &o, stack<Local<Value>> &s) {
+    auto arr = o.As<Array>();
+
+    int arrEnclosedObjectsLength = arr->Length();
+    for (int i = 0; i < arrEnclosedObjectsLength; i++) {
+        auto enclosedElement = arr->Get(i);
+
+        if (!enclosedElement.IsEmpty() && enclosedElement->IsObject()) {
+            s.push(enclosedElement);
+        }
+    }
+}
+
 void ObjectManager::OnGcStartedStatic(Isolate* isolate, GCType type, GCCallbackFlags flags) {
     try {
         auto runtime = Runtime::GetRuntime(isolate);

runtime/src/main/jni/ObjectManager.h

@@ -49,12 +49,15 @@ class ObjectManager {
 
         v8::Local<v8::Object> GetEmptyObject(v8::Isolate* isolate);
 
+        static void MarkReachableArrayElements(v8::Local<v8::Object> &o, std::stack<v8::Local<v8::Value>> &s);
+
         enum class MetadataNodeKeys {
             JsInfo,
             CallSuper,
             END
         };
 
+
     private:
 
         struct JSInstanceInfo {

test-app/app/src/main/assets/app/tests/testGC.js

@@ -264,6 +264,29 @@ describe("Tests garbage collection", function () {
 		gc();
 		java.lang.System.gc();
 	});
+
+	it("should keep array-enclosed objects alive after GC", function () {
+        function createObjects(name) {
+            var arr = new Array();
+            arr.push(new com.tns.tests.Class1());
+
+            var cb1 = new com.tns.tests.Class1.Callback1(name, {
+                getMessage: function() {
+                    var msg = arr[0].getMessage();
+                    return msg;
+                }
+            });
+
+            return com.tns.tests.Class1.Class2.printMessageWithDelay(cb1, 2 * 1000);
+        }
+
+        expect(createObjects("Callback1")).toBe(true);
+        expect(createObjects("Callback2")).toBe(true);
+        expect(createObjects("Callback3")).toBe(true);
+
+        gc();
+        java.lang.System.gc();
+    })
 
 	it("should properly reintroduce Java object back in a callback", function () {
 		function getTestObject() {

test-app/app/src/main/java/com/tns/NativeScriptSyncService.java

@@ -128,7 +128,11 @@ public void run() {
                 int length = input.readInt();
                 input.readFully(new byte[length]); // ignore the payload
                 executePartialSync(context, syncDir);
+                // delete temporary /sync dir after syncing .xml/.css resources
+                deleteRecursive(syncDir);
                 executeRemovedSync(context, removedSyncDir);
+                // delete temporary /removedsync dir after removing files from the project
+                deleteRecursive(removedSyncDir);
 
                 runtime.runScript(new File(NativeScriptSyncService.this.context.getFilesDir(), "internal/livesync.js"));
                 try {
@@ -157,7 +161,11 @@ private void deleteRecursive(File fileOrDirectory) {
             }
         }
 
-        fileOrDirectory.delete();
+        boolean success = fileOrDirectory.delete();
+
+        if (!success && fileOrDirectory.isDirectory()) {
+            android.util.Log.d("Sync", "Failed to delete temp sync directory: " + fileOrDirectory.getAbsolutePath());
+        }
     }
 
     public static boolean isSyncEnabled(Context context) {