Merge branch 'master' into release

Author: Plamen5kov

.gitignore

@@ -15,4 +15,10 @@ obj/
 bin/
 .svn/
 
-**/.vscode/
+**/.vscode/
+
+.project
+.DS_Store
+.settings
+
+build-artifacts/

.idea/gradle.xml

@@ -3,8 +3,6 @@ env:
   - NDK_VERSION=r12b
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
-  - PACKAGE_NAME=tns-android
-  - ANDROID_HOME=/usr/local/android-sdk
 sudo: true
 language: android
 jdk:
@@ -47,26 +45,3 @@ script:
   - "cd test-app && ./gradlew assembleDebug runtests -PembedBindingGenerator=true --stacktrace"
   - adb -e logcat -d 300
   - cd ..
-before_deploy:
-  - FULL_PACKAGE_VERSION=`sed -n 's/\s*"version":\s*"\([a-zA-Z0-9\.]*\)"\s*,*/\1/p' dist/package.json`
-  - ls -la dist
-  - mv dist/tns-android*.tgz ../.deploymentpackage
-  - mv .travis ../
-  - cd ..
-  - rm -rf android-runtime
-  - tar -zxvf .deploymentpackage
-  - mv package android-runtime
-  - cd android-runtime
-  - rm ../.deploymentpackage
-  - nvm install 4.2.6
-  - nvm use 4.2.6
-  - mv ../.travis ./
-  - node ./.travis/add-publishConfig.js next
-deploy:
-  provider: npm
-  email: [email protected]
-  on:
-    branch: master
-  skip_cleanup: true
-  api_key:
-    secure: aFJZR8VIbFAlXfFx5G2AveSgpGjr40prghvw8m06X0yvmUQlucwHVyq+Ov0ZD94br8d7OUOPbUzh+p9N/+oXLAXOj3DbQmJaCc+fk/e+avHu1BRy3fg295P9BQau1Abu+2ZO7tUbg5zAqJqhbEgjXsr9B5gxl+vwh4lbDhCPCwo=

.idea/modules.xml

@@ -1,3 +1,10 @@
+3.2.0
+==
+
+## Bug Fixes
+
+ - [Static binding generator fails when using Webpack + Workers (#778)](https://github.com/NativeScript/android-runtime/issues/778)
+
 3.1.1
 ==
 

.idea/workspace.xml

@@ -1,2 +1,10 @@
 /src/jars/
 /src/com/
+/build
+*.iml
+.gradle
+/local.properties
+/.idea
+!/.idea/misc.xml
+/a
+!.gitignore

.travis.yml

@@ -14,9 +14,18 @@ def cachedJarsFilePath = "$projectDir/cached.txt"
 def jsParserP = "$projectDir/parser/js_parser.js"
 def jsFilesParametersP = "$projectDir/jsFilesParameters.txt"
 
-
-
-//def absoluteOutDir = new File("./outDir")//project.outDir
+def webpackWorkersExcludePath = "$projectDir/../../src/main/assets/app/__worker-chunks.json"
+def webpackWorkersExcludesList = [];
+
+def workersExcludeFile = file(webpackWorkersExcludePath);
+if (workersExcludeFile.exists()) {
+	// in case the file exists but is malformed
+	try {
+		webpackWorkersExcludesList = new JsonSlurper().parseText(workersExcludeFile.text)
+	} catch (all) {
+		println "Malformed workers exclude file at ${webpackWorkersExcludePath}"
+	}
+}
 
 def absoluteOutDir;
 if (project.hasProperty("outDir")) {
@@ -67,6 +76,8 @@ task generateInterfaceNamesList() {
 					str.add("interfacenamegenerator.jar")
 					str.addAll(jarsArr)
 
+					logger.info("Task: generateInterfaceNamesList: Call interfacenamegenerator.jar with arguments: " + str.toString().replaceAll(',', ''))
+
 					args str.toArray()
 				}
 				java.nio.file.Files.write(java.nio.file.Paths.get(cachedJarsFilePath), [current.toString()], utf8)
@@ -75,6 +86,14 @@ task generateInterfaceNamesList() {
 	}
 }
 
+def isJsFile = { fileName -> return fileName.substring(fileName.length() - 3, fileName.length()).equals(".js") }
+
+def isWorkerScript = { fileName ->
+	// Read __worker-chunks.json file containing a list of webpacked workers
+	// ignore worker scripts, so as to not attempt to generate bindings for them
+	return webpackWorkersExcludesList.any{element -> file(element).getAbsolutePath() == fileName}
+}
+
 def traverseDirectory
 
 traverseDirectory = { dir, traverseExplicitly ->
@@ -99,7 +118,7 @@ traverseDirectory = { dir, traverseExplicitly ->
 				return;
 			} else {
 				if (pjson.nativescript['recursive-static-bindings']) {
-					// println "Folder will be traversed completely: " + dir
+					logger.info("Task: traverseDirectory: Folder will be traversed completely: " + dir)
 					traverseExplicitly = true;
 				}
 			}
@@ -111,10 +130,9 @@ traverseDirectory = { dir, traverseExplicitly ->
 	}
 
 	currentDir.eachFile(FileType.FILES) { File f ->
-		def file = f.getAbsolutePath();
-		if (file.substring(file.length() - 3, file.length()).equals(".js")) {
-			// println "Visiting JavaScript file: " + f.getName()
-			inputJsFiles.add(f.getAbsolutePath())
+		def currFile = f.getAbsolutePath();
+		if (isJsFile(currFile) && !isWorkerScript(currFile)) {
+			inputJsFiles.add(currFile)
 		}
 	}
 
@@ -140,6 +158,7 @@ task traverseJsFilesArgs << { //(jsCodeDir, bindingsFilePath, interfaceNamesFile
 	list.add(interfaceNamesFilePath)
 	list.add(jsFilesParameter)
 
+	logger.info("Task: traverseJsFilesArgs: executed with arguments: " + list.toString().replaceAll(',', ''))
 	def proc = list.execute()
 	proc.in.eachLine { line -> println line }
 	proc.out.close()
@@ -235,6 +254,10 @@ class RunAstParserTask extends DefaultTask {
 		list.add(interfaceNamesFilePath)
 		list.add(jsFilesParametersPath)
 
+		if(project.gradle.startParameter.logLevel.equals(LogLevel.DEBUG)) {
+			list.add("enableVerboseLogging")
+		}
+		logger.info("Task: RunAstParserTask: running node with arguments: " + list.toString().replaceAll(',', ''))
 		runCommand(list)
 
 		// inputs.removed { change ->
@@ -263,6 +286,7 @@ task generateBindings() {
 			def jarsArr = jarsAsStr.replaceAll(/[\[\]]/, "").split(", ")
 			str.addAll(jarsArr)
 
+			logger.info("Task generateBindings: Call staticbindinggenerator.jar with arguments: " + str.toString().replaceAll(',', ''))
 			args str.toArray()
 		}
 	}

.travis/add-publishConfig.js

@@ -0,0 +1,8 @@
+/build
+*.iml
+.gradle
+/local.properties
+/.idea
+!/.idea/misc.xml
+/a
+!.gitignore

CHANGELOG.md

@@ -0,0 +1,21 @@
+group 'interfacenamegenerator'
+version '1.0-SNAPSHOT'
+
+apply plugin: 'java'
+jar.archiveName = "interfacenamegenerator.jar"
+
+sourceCompatibility = 1.5
+
+repositories {
+    mavenCentral()
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': 'com.ig.GetInterfaceNames'
+    }
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.11'
+}

android-metadata-generator/.gitignore

@@ -0,0 +1,6 @@
+#Mon Jul 24 14:31:56 EEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip