Merge branch 'master' into release

Author: blagoev

.travis.yml

@@ -33,15 +33,16 @@ before_install:
   - export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
   - export PATH=${PATH}:${ANDROID_NDK_HOME}
 script:
-  - "./gradlew createPackage -i -PPACKAGE_VERSION=$PACKAGE_VERSION --stacktrace"
+  - "./gradlew createPackage -i -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace"
   - echo no | android create avd --force -n Arm21 -t android-21 -b armeabi-v7a -c 12M
   - emulator -avd Arm21 -no-skin -no-audio -no-window &
   - android-wait-for-emulator
   - "cd test-app && ./gradlew runtest --stacktrace"
   - cd ..
 before_deploy:
   - FULL_PACKAGE_VERSION=`sed -n 's/\s*"version":\s*"\([a-zA-Z0-9\.]*\)"\s*,*/\1/p' dist/package.json`
-  - mv dist/$PACKAGE_NAME-$FULL_PACKAGE_VERSION.tgz ../.deploymentpackage
+  - ls -la dist
+  - mv dist/tns-android*.tgz ../.deploymentpackage
   - mv .travis ../
   - cd ..
   - rm -rf android-runtime

build-artifacts/project-template-gradle/build-tools/android-static-binding-generator/ast-parser/visitors/es5-visitors.js

@@ -11,7 +11,9 @@ var es5_visitors = (function () {
 		TYPESCRIPT_EXTEND_STRING = FILE_SEPARATOR + "rnal_ts_helpers_l47_c38",
 		customExtendsArr = [],
 		normalExtendsArr = [],
-		interfacesArr = [];
+		interfacesArr = [],
+
+		customExtendsArrGlobal = [];
 
 	/* 	ENTRY POINT!
 	*	Traverses each passed node with several visitors.
@@ -227,7 +229,7 @@ var es5_visitors = (function () {
 		if(config.logger) {
 			config.logger.info(lineToWrite)
 		}
-		customExtendsArr.push(lineToWrite)
+		addCustomExtend(classNameFromDecorator, config.fullPathName, lineToWrite)
 	}
 
 	/* 
@@ -299,8 +301,9 @@ var es5_visitors = (function () {
 				if(config.logger) {
 					config.logger.info(lineToWrite)
 				}
-				lineToWrite =  _generateLineToWrite(isCorrectExtendClassName ? className : "", extendClass.reverse().join("."), overriddenMethodNames, "", config.fullPathName);
-				customExtendsArr.push(lineToWrite)
+				var classNameFromDecorator = isCorrectExtendClassName ? className : "";
+				lineToWrite =  _generateLineToWrite(classNameFromDecorator, extendClass.reverse().join("."), overriddenMethodNames, "", config.fullPathName);
+				addCustomExtend(classNameFromDecorator, config.fullPathName, lineToWrite)
 				return;
 			}
 
@@ -464,6 +467,22 @@ var es5_visitors = (function () {
 		return lineToWrite;
 	}
 
+	function addCustomExtend(param, extendPath, lineToWrite) {
+		if(customExtendsArrGlobal.indexOf(param) === -1) {
+			customExtendsArr.push(lineToWrite)
+			customExtendsArrGlobal.push(param)
+		}
+		else {
+			console.log("Warning: there already is an extend called " + param + ".")
+			if(extendPath.indexOf("tns_modules") === -1) {
+				// app folder will take precedence over tns_modules
+				console.log("Warning: The static binding generator will generate extend from:" + extendPath + " implementation")
+				customExtendsArr.push(lineToWrite)
+				customExtendsArrGlobal.push(param)
+			}
+		}
+	}
+
 	return {
 		es5Visitor: es5Visitor
 	}

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

@@ -10,12 +10,12 @@
 *			-Palias=[alias_to_use_from_keystore_file]
 *			-Ppassword=[password_for_alias]
 *
-*			-PtargetSdk=[target_sdk] (default is 22)
-*			-PbuildToolsVersion=[build_tools_version] (default is 22.0.1)
-*			-PsupportVersion=[support_version] (default (22.2.0)
-*			-PcompileSdk=[compile_sdk_version] (default 22)
+*			-PtargetSdk=[target_sdk]
+*			-PbuildToolsVersion=[build_tools_version]
+*			-PsupportVersion=[support_version]
+*			-PcompileSdk=[compile_sdk_version]
 
-*			-PdontRunSbg=[true/false] (default false)
+*			-PdontRunSbg=[true/false]
 */
 
 import groovy.json.JsonSlurper //used to parse package.json
@@ -222,6 +222,60 @@ task pluginStructureCheck {
 	}
 }
 
+def updateProductFlavorsContent(flavor, dimensionName, oldContent) {
+	def endIndex = oldContent.length() - 1;
+		def index = 0;
+		def newContent = "";
+		def level = -1;
+		def dimensionFound = false;
+
+		while(index <= endIndex) {
+			if(level == 0 && (oldContent[index] == '"' || oldContent[index] == "'")) {
+				def closingQuotes = oldContent.indexOf('"', index + 1);
+				if(closingQuotes == -1) {
+					closingQuotes = oldContent.indexOf("'", index + 1);
+				}
+
+				index = closingQuotes + 1;
+				newContent += "\"${flavor}\"";
+				continue;
+			}
+
+			if(oldContent[index] == "{") {
+				level++;	
+			}
+
+			if(oldContent[index] == "}") {
+				level--;
+			}
+
+			if(level > 0) {
+				if(!dimensionFound && oldContent.indexOf("dimension", index) == index) {
+					newContent += "dimension \"${dimensionName}\"";
+					dimensionFound = true;
+					index += "dimension ".length();
+					def openingQuoutes = oldContent.indexOf('"', index);
+					if(openingQuoutes == -1) {
+						openingQuoutes = oldContent.indexOf("'", index);
+					}
+
+					def closingQuotes = oldContent.indexOf('"', openingQuoutes + 1);
+					if(closingQuotes == -1) {
+						closingQuotes = closingQuotes.indexOf("'", openingQuoutes + 1);
+					}	
+
+					index = closingQuotes + 1;
+				}
+			}
+
+			newContent += oldContent[index];
+
+			index++;
+		}
+
+		return newContent;
+}
+
 def createProductFlavorsContent(flavor, dimensionName, includeAndroidContent = true)
 {
 	if (includeAndroidContent)
@@ -250,7 +304,6 @@ android {
 	}
 }
 
-
 def createIncludeFile (filePath, flavor, dimensionName) {
 	println "\t + creating include.gradle file for ${filePath}" 
 
@@ -264,39 +317,38 @@ def sanatizeDimensionName(str) {
 
 def replaceProductFlavorInContent(content, dimension, flavor)
 {
-  def indexStart = content.indexOf("productFlavors");
-  def index = indexStart  + "productFlavors".length();
-  def indexEnd = -1;
-  def nestedOpenBraketsCount = 0;
-
-  while (index < content.length())
-  {
-      print content[index]
-      if (content[index] == "}")
-      {
-          if (nestedOpenBraketsCount == 0)
-          {
-              indexEnd = index;
-              break;
-          }
-          else
-          {
-              nestedOpenBraketsCount--;
-          }
-      }
-      else if (content[index] == "{")
-      {
-          nestedOpenBraketsCount++;
-      }
-
-      index++;
-  }
-
-    if (indexEnd != -1)
+	def indexStart = content.indexOf("productFlavors");
+	def index = indexStart  + "productFlavors".length();
+	def indexEnd = -1;
+	def nestedOpenBraketsCount = 0;
+
+	while (index < content.length())
+	{
+		// print content[index];
+		if (content[index] == "}")
+		{
+			nestedOpenBraketsCount--;
+
+			if (nestedOpenBraketsCount == 0)
+			{
+				indexEnd = index;
+				break;
+			}
+		}
+		else if (content[index] == "{")
+		{
+			nestedOpenBraketsCount++;
+		}
+
+		index++;
+	}
+
+	if (indexEnd != -1)
     {
-      def oldProductFlavorsText = content.substring(indexStart, indexEnd - 1);
-      
-      def newProductFlavorsContent = createProductFlavorsContent(flavor, dimension, false);
+		// full content of productFlavors { ... } -> the substring is parenthesis to parenthesis -> { ... }
+      def oldProductFlavorsText = content.substring(indexStart, indexEnd + 1);
+
+      def newProductFlavorsContent = updateProductFlavorsContent(flavor, dimension, oldProductFlavorsText);
 
       return content.replace(oldProductFlavorsText, newProductFlavorsContent);
     }

build-artifacts/project-template-gradle/src/main/java/com/tns/AndroidJsDebugger.java

@@ -437,11 +437,12 @@ public void start()
 		Handler handler = new Handler(handlerThread.getLooper());
 
 		this.registerEnableDisableDebuggerReceiver(handler);
-		
+
+		AndroidJsDebugger.this.debugContext.enableAgent();
+
 		boolean shouldDebugBreak = getDebugBreakFlagAndClearIt();
 		if (shouldDebugBreak)
 		{
-			AndroidJsDebugger.this.debugContext.enableAgent();
 			AndroidJsDebugger.this.debugContext.debugBreak();
 		}
 	}