Merge master into release

CHANGELOG.md

@@ -1,11 +1,27 @@
-Android Runtime Changelog
-==============================
+# Android Runtime Changelog
 
-0.10.0 (2015, April 17)
-==
+## 1.0.0 (2015, April 29)
+
+### New
+
+* Updated the V8 version to 4.1.0.27.
+* Re-implemented debugger support (no more spontaneous dead locks).
 
 ### Fixed
 
+* An issue with the error reporting routine.
+
+### Breaking Changes
+
+* Renamed global functions:
+	* `__log` (was `Log`)
+	* `__debugbreak` (was `waitForDebugger`)
+	* `__enableVerboseLogging` (was `enableVerboseLogging`)
+	* `__disableVerboseLogging` (was `disableVerboseLogging`)
+	* `__exit` (was `fail`)
+
+## 0.10.0 (2015, April 17)
+
 ### New
 
 * Added Dynamic Generator for binding proxies. This boosts the initial loading time, especially on Android 5.0+ devices.

binding-generator/Generator/src/com/tns/NativeScriptHashCodeProvider.java

@@ -5,8 +5,4 @@ public interface NativeScriptHashCodeProvider
 	int hashCode__super();
 
 	boolean equals__super(Object other);
-
-//	void setNativeScriptOverrides(String[] overrides);
-
-	void setNativeScriptOverride(String override);
 }

binding-generator/Generator/src/com/tns/bindings/ProxyGenerator.java

@@ -53,7 +53,7 @@ public String generateProxy(String proxyName, Class<?> classToProxy, HashSet<Str
 		aw.visitEnd();
 		byte[] generatedBytes = aw.toByteArray();
 
-		String proxyFileName = classToProxy.getName().replace('$', '_') + "-" + proxyName;
+		String proxyFileName = classToProxy.getName().replace('$', '_') + Dump.CLASS_NAME_LOCATION_SEPARATOR + proxyName;
 		if (proxyThumb != null)
 		{
 			proxyFileName += "-" + proxyThumb;

binding-generator/Tester/src/com/proxy/TargetObject.java

@@ -20,6 +20,22 @@ public void methodWithStringArg(String a)
 		Log.d("Proxy.Tester", "methodWithStringArg: " + a);
 	}
 
+	public void methodWithOverload(int a)
+	{
+		Log.d("Proxy.Tester", "methodWithOverload: " + a);
+	}
+
+	public void methodWithOverload(byte a)
+	{
+		Log.d("Proxy.Tester", "methodWithOverload: " + a);
+	}
+
+	public void methodWithOverload()
+	{
+		arg = null;
+		Log.d("Proxy.Tester", "methodWithOverload no args");
+	}
+
 	public void methodWithIntArg(int a)
 	{
 		arg = a;

build/project-template/custom_rules.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="custom_logic_for_metadata_generation" default="-post-compile">
 
+    <condition property="supportedJavaVersion">
+      <or>
+       <equals arg1="1.7" arg2="${ant.java.version}"/>
+       <equals arg1="1.8" arg2="${ant.java.version}"/>
+      </or>
+    </condition>
+
+    <fail message="Java 1.7 or newer is required. Check if the JAVA_HOME environment variable points to JDK 1.7 or newer" unless="supportedJavaVersion"/>
+
     <property name="path_to_metadata" value="./assets/metadata"/>
     <property name="ns.project.lib" value="../../lib/Android" />
 

build/project-template/res/values-v21/styles.xml

@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Application theme -->
     <style name="AppTheme" parent="android:Theme.Material.Light">
-    </style>
+    	<item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
+    	<item name="android:timePickerStyle">@style/SpinnerTimePicker</item>
+	</style>
+
+    <!-- Default style for DatePicker - in spinner mode -->
+	<style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
+	    <item name="android:datePickerMode">spinner</item>
+	</style>
+
+    <!-- Default style for TimePicker - in spinner mode -->
+	<style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
+	    <item name="android:timePickerMode">spinner</item>
+	</style>
 </resources>

build/project-template/res/values/styles.xml

@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
-        <!--
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        -->
-    </style>
-
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
-    </style>
-</resources>
+<resources>
+    <!-- Application theme -->
+    <style name="AppTheme" parent="android:Theme.Holo.Light">
+    </style>
+</resources>

gruntfile.js

@@ -195,7 +195,19 @@ module.exports = function(grunt) {
             },
             runMetadataGenerator: {
                 cmd: "./node_modules/.bin/generate-metadata " + localCfg.libsDir + " ./dist/framework/assets/metadata"
-            }
+            },
+			runTests: {
+				cmd: "npm install && grunt --verbose",
+                cwd: "./test-app"
+			},
+			antCleanBindingGenerator: {
+				cmd: "ant clean",
+				cwd: "./binding-generator/Generator/"
+			},
+			antCleanRunTime: {
+				cmd: "ant clean",
+				cwd: "./src/"
+			},
         }
     });
 
@@ -206,7 +218,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks("grunt-replace");
 
     grunt.registerTask("generateRuntime", [
-                            "exec:generateRuntime"
+				"exec:generateRuntime"
             ]);
 
     grunt.registerTask("generateMetadata", [
@@ -230,6 +242,12 @@ module.exports = function(grunt) {
             return [];
         }
     })());
+
+	grunt.registerTask("test", [
+				"exec:antCleanBindingGenerator",
+				"exec:antCleanRunTime",
+				"exec:runTests"
+            ]);
 
     grunt.registerTask("default", [
                             "clean:build",

src/assets/app/bootstrap.js

@@ -1,7 +1,7 @@
 global.__onUncaughtError = function(error){
 	if(error.nativeException){
-		Log("err.message: " + error.message);
-		Log("err.stackTrace: " + error.stackTrace);
+		__log("err.message: " + error.message);
+		__log("err.stackTrace: " + error.stackTrace);
 		// false == do not continue execution
 		return false;
 	}

src/assets/internal/prepareExtend.js

@@ -57,7 +57,7 @@ var __extends = function(Child, Parent) {
 		}
 
 		function extend(child, parent) {
-			Log("TS extend called");
+			__log("TS extend called");
 			if (!child.__extended) {
 	        	child.__extended = parent.extend(child.name, child.prototype);
 	        }
@@ -66,7 +66,7 @@ var __extends = function(Child, Parent) {
 	    };
 
 	    Parent.__activityExtend = function(parent, name, implementationObject) {
-	    	Log("__activityExtend called");
+	    	__log("__activityExtend called");
 	    	return parent.extend(name, implementationObject);
 	    };
 

src/jni/Android.mk

@@ -62,7 +62,7 @@ include $(PREBUILT_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_CPPFLAGS += -std=c++11
 LOCAL_MODULE    := NativeScript
-LOCAL_SRC_FILES := com_tns_Platform.cpp com_tns_JsDebugger.cpp com_tns_AssetExtractor.cpp \
+LOCAL_SRC_FILES := com_tns_Platform.cpp com_tns_JsDebugger.cpp com_tns_AssetExtractor.cpp com_tns_NativeScriptActity.cpp \
 					JEnv.cpp DirectBuffer.cpp \
 					JsDebugger.cpp \
 					NativeScriptRuntime.cpp MetadataNode.cpp MetadataTreeNode.cpp MetadataReader.cpp \