Merge branch 'master' into vmutafov/sbg-refactoring-beta

Author: vmutafov

test-app/app/build.gradle

@@ -427,7 +427,7 @@ task runSbg(type: JavaExec) {
         dependsOn ':static-binding-generator:jar'
     }
 
-    outputs.dir(OUTPUT_JAVA_DIR)
+    outputs.dir("$OUTPUT_JAVA_DIR/com/tns/gen")
     inputs.dir(INPUT_JS_DIR)
     inputs.dir(extractedDependenciesDir)
 

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

@@ -13,7 +13,7 @@
 	}
 	
 	@JavaProxy("com.tns.NativeScriptActivity")
-	class MyActivity extends android.support.v7.app.AppCompatActivity
+	class MyActivity extends android.app.Activity
 	{
 		onCreate(bundle: android.os.Bundle) 
 		{
@@ -62,4 +62,4 @@ var MyActivity = (function (_super) {
         JavaProxy("com.tns.NativeScriptActivity")
     ], MyActivity);
     return MyActivity;
-})(android.support.v7.app.AppCompatActivity);
+})(android.app.Activity);

test-app/build-tools/jsparser/tests/cases/decorated_double_assignment_ts/app/myCustomActivity.android.ts

@@ -1,7 +1,7 @@
 import Bundle = android.os.Bundle;
 
 @JavaProxy('org.nativescript.MyCustomActivity')
-export class TestActivity extends android.support.v7.app.AppCompatActivity {
+export class TestActivity extends android.app.Activity {
     static readonly TEST1: string = "my_test";
     public onCreate(savedInstanceState?: Bundle): void {
         super.onCreate(savedInstanceState);

test-app/build-tools/jsparser/tests/cases/decorated_double_assignment_ts/app/myCustomActivity_ts.android.js

@@ -16,5 +16,5 @@ var TestActivity = (function (_super) {
         JavaProxy('org.nativescript.MyCustomActivity')
     ], TestActivity);
     return TestActivity;
-}(android.support.v7.app.AppCompatActivity));
+}(android.app.Activity));
 exports.TestActivity = TestActivity;