NativeScript · hdeshev · Feb 18, 2016 · Feb 18, 2016 · Feb 18, 2016 · Feb 18, 2016
diff --git a/gruntfile.js b/gruntfile.js
@@ -80,18 +80,9 @@ module.exports = function(grunt) {
 
     grunt.registerTask("cleanAll", [
         'clean:src',
-        'fix-unsupported-typings',
         'clean:package',
     ]);
 
-    grunt.registerTask("fix-unsupported-typings", function() {
-        var zoneDts = path.join('node_modules', 'angular2', 'typings', 'zone', 'zone.d.ts');
-        shelljs.sed('-i', /.*reference.*path.*es6-shim.*\n/g, '', zoneDts);
-
-        var globalsEs6Dts = path.join('node_modules', 'angular2', 'manual_typings', 'globals-es6.d.ts');
-        shelljs.sed('-i', /.*reference.*path.*node\.d\.ts.*\n/g, '', globalsEs6Dts);
-    });
-
     grunt.registerTask("package", [
         "clean:packageDefinitions",
         "copy:handCodedDefinitions",

diff --git a/ng-sample/package.json b/ng-sample/package.json
@@ -24,14 +24,14 @@
 	"homepage": "https://github.com/NativeScript/template-hello-world",
 	"dependencies": {
 		"tns-core-modules": "^1.6.0",
-		"angular2": "2.0.0-beta.3",
+		"angular2": "2.0.0-beta.6",
 		"parse5": "1.4.2",
 		"punycode": "1.3.2",
 		"querystring": "0.2.0",
 		"url": "0.10.3",
 		"reflect-metadata": "0.1.2",
 		"rxjs": "5.0.0-beta.0",
-		"zone.js": "0.5.11"
+		"zone.js": "0.5.14"
 	},
 	"devDependencies": {
 		"grunt": "0.4.5",

diff --git a/ng-sample/references.d.ts b/ng-sample/references.d.ts
@@ -0,0 +1,2 @@
+
+/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
diff --git a/ng-sample/tsconfig.json b/ng-sample/tsconfig.json
@@ -14,4 +14,4 @@
         "node_modules",
         "platforms"
     ]
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-angular",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "",
   "homepage": "http://www.telerik.com",
   "bugs": "http://www.telerik.com",
@@ -15,15 +15,15 @@
   "scripts": {},
   "dependencies": {
       "tns-core-modules": "^1.6.0",
-      "angular2": "2.0.0-beta.3",
+      "angular2": "2.0.0-beta.6",
       "es6-shim": "^0.33.3",
       "parse5": "1.4.2",
       "punycode": "1.3.2",
       "querystring": "0.2.0",
       "url": "0.10.3",
       "reflect-metadata": "0.1.2",
       "rxjs": "5.0.0-beta.0",
-      "zone.js": "0.5.11"
+      "zone.js": "0.5.14"
   },
   "devDependencies": {
     "grunt": "0.4.5",

diff --git a/src/global.d.ts b/src/global.d.ts
@@ -1,31 +1,9 @@
-/// <reference path="../node_modules/angular2/typings/es6-shim/es6-shim.d.ts" />
-/// <reference path="../node_modules/angular2/typings/node/node.d.ts" />
-/// <reference path="../node_modules/tns-core-modules/tns-core-modules.base.d.ts" />
-declare var assert: any;
+/// <reference path="../node_modules/tns-core-modules/tns-core-modules.d.ts" />
 
 interface Map<K, V> {
     keys(): Array<K>;
     values(): Array<V>;
 }
 
-declare type NativeScriptModule = NodeModule
-declare type NativeScriptRequire = NodeRequire
-
-//declare type MapConstructor = typeof Map;
-//declare type SetConstructor = typeof Set;
-
-interface NumberConstructor {
-    isInteger(number: number): boolean;
-}
-
-interface Array<T> {
-    fill(value: T, start?: number, end?: number): T[];
-}
-
-interface String {
-    endsWith(searchString: string, endPosition?: number): boolean;
-    startsWith(searchString: string, position?: number): boolean;
-}
-
-interface Zone {
-}
+declare type MapConstructor = typeof Map;
+declare type SetConstructor = typeof Set;
diff --git a/tests/app/App_Resources/Android/AndroidManifest.xml b/tests/app/App_Resources/Android/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="__PACKAGE__"
+	android:versionCode="1"
+	android:versionName="1.0">
+
+	<supports-screens
+		android:smallScreens="true"
+		android:normalScreens="true"
+		android:largeScreens="true"
+		android:xlargeScreens="true"/>
+
+	<uses-sdk
+		android:minSdkVersion="17"
+		android:targetSdkVersion="__APILEVEL__"/>
+
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.INTERNET"/>
+
+	<application
+		android:name="com.tns.NativeScriptApplication"
+		android:allowBackup="true"
+		android:icon="@drawable/icon"
+		android:label="@string/app_name"
+		android:theme="@style/AppTheme" >
+		<activity
+			android:name="com.tns.NativeScriptActivity"
+			android:label="@string/title_activity_kimera"
+			android:configChanges="keyboardHidden|orientation|screenSize">
+
+				<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+		<activity android:name="com.tns.ErrorReportActivity"/>
+	</application>
+</manifest>
diff --git a/tests/app/global.d.ts b/tests/app/global.d.ts
@@ -1,5 +1,4 @@
 /// <reference path="../node_modules/tns-core-modules/tns-core-modules.d.ts" />
-declare var assert: any;
 
 interface Map<K, V> {
     keys(): Array<K>;
@@ -8,19 +7,3 @@ interface Map<K, V> {
 
 declare type MapConstructor = typeof Map;
 declare type SetConstructor = typeof Set;
-
-interface NumberConstructor {
-    isInteger(number: number): boolean;
-}
-
-interface Array<T> {
-    fill(value: T, start?: number, end?: number): T[];
-}
-
-interface String {
-    endsWith(searchString: string, endPosition?: number): boolean;
-    startsWith(searchString: string, position?: number): boolean;
-}
-
-interface Zone {
-}
diff --git a/tests/app/tests/bootstrap.ts b/tests/app/tests/bootstrap.ts
@@ -4,6 +4,8 @@ import "reflect-metadata";
 import {bootstrap} from "../nativescript-angular/application";
 import {Component} from "angular2/core";
 global.assert = realAssert;
+import * as chai from "chai"
+declare var assert: typeof chai.assert;
 
 @Component({
     template: "<Button text='OHAI'></Button>"

diff --git a/tests/hooks/before-prepare/15-remove-unsupported-angular-typings.js b/tests/hooks/before-prepare/15-remove-unsupported-angular-typings.js
diff --git a/tests/hooks/before-prepare/30-remove-stale-widgets-jar.js b/tests/hooks/before-prepare/30-remove-stale-widgets-jar.js
diff --git a/...prepare/20-nativescript-dev-typescript.js → ...re-prepare/nativescript-dev-typescript.js b/...prepare/20-nativescript-dev-typescript.js → ...re-prepare/nativescript-dev-typescript.js
diff --git a/tests/package.json b/tests/package.json
@@ -1,52 +1,52 @@
 {
-  "nativescript": {
-    "id": "org.nativescript.helloworldng",
-    "tns-android": {
-      "version": "1.6.0"
-    }
-  },
-  "name": "nativescript-hello-world-ng",
-  "main": "app.js",
-  "version": "1.0.0",
-  "author": "Telerik <support@telerik.com>",
-  "description": "Nativescript Angular Hello World template",
-  "license": "BSD",
-  "keywords": [
-    "telerik",
-    "mobile",
-    "angular",
-    "nativescript",
-    "{N}",
-    "tns",
-    "appbuilder",
-    "template"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/NativeScript/template-hello-world-ng"
-  },
-  "homepage": "http://nativescript.org",
-  "dependencies": {
-    "angular2": "2.0.0-beta.3",
-    "nativescript-unit-test-runner": "^0.2.8",
-    "parse5": "1.4.2",
-    "punycode": "1.3.2",
-    "querystring": "0.2.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.0",
-    "tns-core-modules": "1.6.0",
-    "url": "0.10.3",
-    "zone.js": "0.5.11"
-  },
-  "devDependencies": {
-    "chai": "^3.5.0",
-    "karma": "^0.13.19",
-    "karma-chai": "^0.1.0",
-    "karma-mocha": "^0.2.1",
-    "karma-nativescript-launcher": "^0.3.1",
-    "mocha": "^2.4.5",
-    "nativescript-dev-typescript": "^0.2.2",
-    "shelljs": "^0.5.3",
-    "typescript": "^1.7.5"
-  }
-}
+	"nativescript": {
+		"id": "org.nativescript.helloworldng",
+		"tns-android": {
+			"version": "1.6.0"
+		}
+	},
+	"name": "nativescript-hello-world-ng",
+	"main": "app.js",
+	"version": "1.0.0",
+	"author": "Telerik <support@telerik.com>",
+	"description": "Nativescript Angular Hello World template",
+	"license": "BSD",
+	"keywords": [
+		"telerik",
+		"mobile",
+		"angular",
+		"nativescript",
+		"{N}",
+		"tns",
+		"appbuilder",
+		"template"
+	],
+	"repository": {
+		"type": "git",
+		"url": "git://github.com/NativeScript/template-hello-world-ng"
+	},
+	"homepage": "http://nativescript.org",
+	"dependencies": {
+		"angular2": "2.0.0-beta.6",
+		"nativescript-unit-test-runner": "^0.2.8",
+		"parse5": "1.4.2",
+		"punycode": "1.3.2",
+		"querystring": "0.2.0",
+		"reflect-metadata": "0.1.2",
+		"rxjs": "5.0.0-beta.0",
+		"tns-core-modules": "1.6.0",
+		"url": "0.10.3",
+		"zone.js": "0.5.14"
+	},
+	"devDependencies": {
+		"chai": "^3.5.0",
+		"karma": "^0.13.19",
+		"karma-chai": "^0.1.0",
+		"karma-mocha": "^0.2.1",
+		"karma-nativescript-launcher": "^0.3.1",
+		"mocha": "^2.4.5",
+		"nativescript-dev-typescript": "^0.2.2",
+		"shelljs": "^0.5.3",
+		"typescript": "^1.7.5"
+	}
+}
diff --git a/tests/references.d.ts b/tests/references.d.ts
@@ -1 +1 @@
-/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
+/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
@@ -12,18 +12,6 @@
         "noEmitHelpers": false,
         "noEmitOnError": true
     },
-    "files": [
-        "app/main.ts",
-        "app/global.d.ts",
-        "app/app.component.ts",
-        "app/tests/bootstrap.ts",
-        "typings/mocha.d.ts",
-        "node_modules/tns-core-modules/tns-core-modules.d.ts"
-    ],
-    "filesGlob": [
-        "node_modules/tns-core-modules/tns-core-modules.d.ts",
-        "app/**/*.ts"
-    ],
     "exclude": [
         "node_modules",
         "platforms"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@

		/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ @@
             "node_modules",
             "platforms"
         ]
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
		/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.