resolve merge conflict

Author: petekanev

CHANGELOG.md

@@ -1,3 +1,9 @@
+3.1.1
+==
+
+## Bug Fixes
+ - [APKS with ABI split crash on start up (#785)](https://github.com/NativeScript/android-runtime/issues/785)
+
 3.1.0
 ==
 

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

@@ -171,6 +171,27 @@ android {
 		}
 
 		compileSourcesTask.finalizedBy(buildMetadata)
+
+		// forces packaging of resources and assets AFTER producing metadata
+		// Reference: https://github.com/NativeScript/android-runtime/issues/785
+
+		// Ensure metadata has been built and copied in assets before packaging
+		variant.outputs.each { output ->
+			def abiName = "";
+			if (output.getFilter(com.android.build.OutputFile.ABI)) {
+				abiName = output.getFilter(com.android.build.OutputFile.ABI)
+				def packageTask = project.tasks.findByName("package${output.name}")
+				if (packageTask) {
+					packageTask.dependsOn(buildMetadata)
+				}
+			}
+		}
+
+		// Compile the Java sources AFTER the Java code-generation step is done
+		def compileTask = project.tasks.findByName("compile${variantName}JavaWithJavac")
+		if (compileTask) {
+			compileTask.dependsOn("asbg:generateBindings")
+		}
 	}
 }
 
@@ -413,13 +434,11 @@ task createDefaultIncludeFiles {
 			if (hasChildrenDirs) {
 				file.listFiles().each { subFile ->
 					if (subFile.isDirectory()) {
-						flavorNumber++
-						createIncludeGradleForPlugin(subFile, flavorNumber, flavorNames)
+						createIncludeGradleForPlugin(subFile, flavorNumber++, flavorNames)
 					}
 				}
 			} else {
-				flavorNumber++
-				createIncludeGradleForPlugin(file, flavorNumber, flavorNames)
+				createIncludeGradleForPlugin(file, flavorNumber++, flavorNames)
 			}			
 		}
 	}
@@ -730,6 +749,7 @@ setProperties.finalizedBy("asbg:generateBindings", generateTypescriptDefinitions
 // 5. plugin extend (apply from include files)
 
 // --execution phase
+
 ensureMetadataOutDir.dependsOn(cleanLocalAarFiles)
 collectAllJars.dependsOn(ensureMetadataOutDir)
 buildMetadata.dependsOn(collectAllJars)

package.json

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

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

@@ -1,18 +1,30 @@
 describe("Runtime exposes", function () {
   it("__time a low overhead, high resolution, time in ms.", function() {
-    var dateTimeStart = Date.now();
-    var timeStart = __time();
-    var acc = 0;
-    var s = android.os.SystemClock.elapsedRealtime();
-    for (var i = 0; i < 1000; i++) {
-      var c = android.os.SystemClock.elapsedRealtime();
-      acc += (c - s);
-      s = c;
+    // Try to get the times using Date.now and __time and compare the results, expect them to be somewhat "close".
+    // Sometimes GC hits after Date.now is captured but before __time or the vice-versa and the test fails,
+    // so we are giving it several attempts.
+    for(var i = 0; i < 5; i++) {
+      try {
+        var dateTimeStart = Date.now();
+        var timeStart = __time();
+        var acc = 0;
+        var s = android.os.SystemClock.elapsedRealtime();
+        for (var i = 0; i < 1000; i++) {
+          var c = android.os.SystemClock.elapsedRealtime();
+          acc += (c - s);
+          s = c;
+        }
+        var dateTimeEnd = Date.now();
+        var timeEnd = __time();
+        var dateDelta = dateTimeEnd - dateTimeStart;
+        var timeDelta = timeEnd - timeStart;
+        expect(Math.abs(dateDelta - timeDelta) < dateDelta * 0.25).toBe(true);
+        break;
+      } catch(e) {
+        if (i == 4) {
+          throw e;
+        }
+      }
     }
-    var dateTimeEnd = Date.now();
-    var timeEnd = __time();
-    var dateDelta = dateTimeEnd - dateTimeStart;
-    var timeDelta = timeEnd - timeStart;
-    expect(Math.abs(dateDelta - timeDelta) < dateDelta * 0.25).toBe(true);
   });
 });