Merge branch 'master' into TIMOB-27252

.eslintignore

@@ -4,7 +4,7 @@ node_modules
 
 android/runtime/v8/tools/bootstrap.js
 android/dev
-android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/*.js
+android/modules/ui/assets/Resources/ti.internal/webview/*.js
 
 iphone/Resources/app.js
 

.eslintrc

@@ -1,7 +1,7 @@
 {
   "extends": [ "axway/env-node", "axway/+mocha"],
   "parserOptions": {
-    "ecmaVersion": 2015,
+    "ecmaVersion": 2017,
     "sourceType": "script"
   },
   "globals": {

Jenkinsfile

@@ -294,7 +294,11 @@ timestamps {
 					// TODO parallelize the iOS/Android/Mobileweb/Windows portions?
 					dir('build') {
 						timeout(15) {
-							sh "node scons.js build --android-ndk ${env.ANDROID_NDK_R16B} --android-sdk ${env.ANDROID_SDK}"
+							if (includeWindows) {
+								sh "node scons.js build --android-ndk ${env.ANDROID_NDK_R16B} --android-sdk ${env.ANDROID_SDK} --all"
+							} else {
+								sh "node scons.js build --android-ndk ${env.ANDROID_NDK_R16B} --android-sdk ${env.ANDROID_SDK}"
+							}
 						} // timeout
 						ansiColor('xterm') {
 							timeout(15) {

android/build/common.xml

@@ -353,10 +353,10 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
 	</target>
 
 	<macrodef name="generate.build.properties">
-		<attribute name="dir" default="${dist.classes.dir}/titanium"/>
+		<attribute name="dir" default="${titanium.project.dir}/titanium"/>
 		<sequential>
-			<mkdir dir="@{dir}/org/appcelerator/titanium"/>
-			<propertyfile file="@{dir}/org/appcelerator/titanium/build.properties"
+			<mkdir dir="@{dir}/assets/Resources/ti.internal"/>
+			<propertyfile file="@{dir}/assets/Resources/ti.internal/build.properties"
 				comment="Generated by Titanium">
 				<entry key="build.version" value="${build.version}"/>
 				<entry key="build.timestamp" type="date" value="now"/>
@@ -634,6 +634,9 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
 			<fileset dir="${dist.json.dir}">
 				<include name="org/appcelerator/titanium/bindings/titanium.json"/>
 			</fileset>
+			<fileset dir="${titanium.project.dir}/titanium">
+				<include name="assets/**"/>
+			</fileset>
 		</jar>
 
 		<ti.getModuleBuildOrder json="${dependency.json}" property="modules"/>
@@ -644,6 +647,9 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
 				<fileset dir="${dist.json.dir}">
 					<include name="org/appcelerator/titanium/bindings/@{module}.json"/>
 				</fileset>
+				<fileset dir="${modules.dir}/@{module}">
+					<include name="assets/**"/>
+				</fileset>
 			</jar>
 		</sequential>
 		</for>