Prepare 6.3.1 patch (#1561)

* bumping version

* fix(workers): Dispose the isolate when terminating workers (#1550)

* fix: Ensure js timestamp is smaller than corresponding code cache file timestamp (#1554)

* Fix Kotlin enum accessing issue (#1559)

* Update package.json version to 6.3.1

* Update CHANGELOG.md

Co-authored-by: Vasil Trifonov <[email protected]>
Co-authored-by: Darin Dimitrov <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -1,3 +1,12 @@
+6.3.1
+==
+
+## Bug Fixes
+
+- [Kotlin enum values not visible at runtime (#1560)](https://github.com/NativeScript/android-runtime/issues/1560)
+- [Code cache breaks HMR (#1554)](https://github.com/NativeScript/android-runtime/issues/1554)
+- [Worker memory leak in android (#1550)](https://github.com/NativeScript/android-runtime/issues/1550)
+
 6.3.0
 ==
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/android-runtime.git"

test-app/app/src/main/assets/app/mainpage.js

@@ -61,4 +61,5 @@ require("./tests/kotlin/delegation/testDelegationSupport");
 require("./tests/kotlin/objects/testObjectsSupport");
 require("./tests/kotlin/functions/testTopLevelFunctionsSupport");
 require("./tests/kotlin/extensions/testExtensionFunctionsSupport");
+require("./tests/kotlin/enums/testEnumsSupport");
 require("./tests/kotlin/access/testInternalLanguageFeaturesSupport");

test-app/app/src/main/assets/app/tests/kotlin/enums/testEnumsSupport.js

@@ -0,0 +1,10 @@
+describe("Tests Kotlin extension functions support", function () {
+
+    it("Test Kotlin enum entries are accessible", function () {
+        var enumEntry = com.tns.tests.kotlin.enums.KotlinEnum.TEST_ENTRY;
+
+        expect(enumEntry).not.toBe(undefined);
+        expect(enumEntry).not.toBe(null);
+    });
+
+});

test-app/app/src/main/java/com/tns/tests/kotlin/enums/KotlinEnum.kt

@@ -0,0 +1,5 @@
+package com.tns.tests.kotlin.enums
+
+enum class KotlinEnum {
+    TEST_ENTRY
+}

test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/classes/KotlinClassDescriptor.kt

@@ -7,6 +7,7 @@ import com.telerik.metadata.parsing.NativeMethodDescriptor
 import com.telerik.metadata.parsing.NativePropertyDescriptor
 import com.telerik.metadata.parsing.bytecode.classes.NativeClassBytecodeDescriptor
 import com.telerik.metadata.parsing.kotlin.fields.KotlinCompanionFieldDescriptor
+import com.telerik.metadata.parsing.kotlin.fields.KotlinEnumFieldDescriptor
 import com.telerik.metadata.parsing.kotlin.fields.KotlinJvmFieldDescriptor
 import com.telerik.metadata.parsing.kotlin.metadata.MetadataAnnotation
 import com.telerik.metadata.parsing.kotlin.metadata.bytecode.BytecodeClassMetadataParser
@@ -36,7 +37,6 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati
 
     override val fields: Array<NativeFieldDescriptor> by lazy {
         val fields = ArrayList<NativeFieldDescriptor>()
-
         val meta = kotlinMetadata
         var kotlinMetadataProperties: Collection<KmProperty> = emptyList()
 
@@ -48,6 +48,12 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati
             if (possibleCompanionField.isPresent) {
                 fields.add(possibleCompanionField.get())
             }
+
+            if(metaClass.enumEntries.isNotEmpty()){
+                val enumFields = getEnumEntriesAsFields(nativeClass, metaClass.enumEntries)
+                fields.addAll(enumFields)
+            }
+
         } else if (meta is KotlinClassMetadata.FileFacade) {
             kotlinMetadataProperties = meta.toKmPackage().properties
         } else if (meta is KotlinClassMetadata.MultiFileClassPart) {
@@ -107,6 +113,20 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati
         return Optional.empty()
     }
 
+    private fun getEnumEntriesAsFields(nativeClass: JavaClass, metadataEnumEntries: Collection<String>): Collection<KotlinEnumFieldDescriptor> {
+        val bytecodeFields = nativeClass.fields
+
+        val matchingEnumFields = bytecodeFields
+                .filter {
+                    metadataEnumEntries.contains(it.name)
+                }
+                .map {
+                    KotlinEnumFieldDescriptor(it, isPublic, isInternal, isProtected)
+                }
+
+        return matchingEnumFields
+    }
+
     override val properties: Array<out NativePropertyDescriptor> by lazy {
         val metadata = kotlinMetadata
         if (metadata is KotlinClassMetadata.Class) {

test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/fields/KotlinEnumFieldDescriptor.kt

@@ -0,0 +1,9 @@
+package com.telerik.metadata.parsing.kotlin.fields
+
+import com.telerik.metadata.parsing.bytecode.fields.NativeFieldBytecodeDescriptor
+import org.apache.bcel.classfile.Field
+
+class KotlinEnumFieldDescriptor(field: Field,
+                                override val isPublic: Boolean,
+                                override val isInternal: Boolean,
+                                override val isProtected: Boolean) : NativeFieldBytecodeDescriptor(field)

test-app/runtime/src/main/cpp/ModuleInternal.cpp

@@ -22,6 +22,7 @@
 #include <mutex>
 #include <libgen.h>
 #include <dlfcn.h>
+#include <sys/stat.h>
 
 using namespace v8;
 using namespace std;
@@ -460,6 +461,19 @@ ScriptCompiler::CachedData* ModuleInternal::TryLoadScriptCache(const std::string
     }
 
     auto cachePath = path + ".cache";
+
+    struct stat result;
+    if (stat(cachePath.c_str(), &result) == 0) {
+        auto cacheLastModifiedTime = result.st_mtime;
+        if (stat(path.c_str(), &result) == 0) {
+            auto jsLastModifiedTime = result.st_mtime;
+            if (jsLastModifiedTime > 0 && cacheLastModifiedTime > 0 && jsLastModifiedTime > cacheLastModifiedTime) {
+                // The javascript file is more recent than the cache file => ignore the cache
+                return nullptr;
+            }
+        }
+    }
+
     int length = 0;
     auto data = File::ReadBinary(cachePath, length);
     if (!data) {

v8-versions.json

@@ -1,5 +1,5 @@
 {
-    ">=6.2.9 <6.4.0": "7.8.279.19",
+    ">=6.2.9 <6.5.0": "7.8.279.19",
     ">=6.1.9 <6.3.0": "7.7.299.11",
     ">=6.0.9 <6.2.0": "7.6.303.28",
     ">=5.9.9 <6.0.9": "7.5.288.22",