Merge branch 'master' into TIMOB-26833

android/cli/commands/_build.js

@@ -1758,11 +1758,11 @@ AndroidBuilder.prototype.run = function run(logger, config, cli, finished) {
 		},
 
 		'createBuildDirs',
+		'removeOldFiles',
 		'copyResources',
 		'generateRequireIndex',
 		'processTiSymbols',
 		'copyModuleResources',
-		'removeOldFiles',
 		'copyGradleTemplate',
 		'generateJavaFiles',
 		'generateAidl',
@@ -2423,9 +2423,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 
 				// if this is a directory, recurse
 				if (isDir) {
-					setImmediate(function () {
-						recursivelyCopy.call(_t, from, path.join(destDir, filename), null, opts, next);
-					});
+					recursivelyCopy.call(_t, from, path.join(destDir, filename), null, opts, next);
 					return;
 				}
 
@@ -2678,18 +2676,19 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 	}, this);
 
 	appc.async.series(this, tasks, function () {
-		var templateDir = path.join(this.platformPath, 'templates', 'app', 'default', 'template', 'Resources', 'android');
+		const templateDir = path.join(this.platformPath, 'templates', 'app', 'default', 'template', 'Resources', 'android');
 
 		// if an app icon hasn't been copied, copy the default one
-		var destIcon = path.join(this.buildBinAssetsResourcesDir, this.tiapp.icon);
+		const srcIcon = path.join(templateDir, 'appicon.png');
+		const destIcon = path.join(this.buildBinAssetsResourcesDir, this.tiapp.icon);
 		if (!fs.existsSync(destIcon)) {
-			copyFile.call(this, path.join(templateDir, 'appicon.png'), destIcon);
+			copyFile.call(this, srcIcon, destIcon);
 		}
 		delete this.lastBuildFiles[destIcon];
 
 		const destIcon2 = path.join(this.buildResDrawableDir, this.tiapp.icon);
 		if (!fs.existsSync(destIcon2)) {
-			copyFile.call(this, destIcon, destIcon2);
+			copyFile.call(this, srcIcon, destIcon2);
 		}
 		delete this.lastBuildFiles[destIcon2];
 

build/scons-package.js

@@ -27,10 +27,9 @@ program
 	.option('-v, --sdk-version [version]', 'Override the SDK version we report', process.env.PRODUCT_VERSION || version)
 	.option('-t, --version-tag [tag]', 'Override the SDK version tag we report')
 	.option('-s, --skip-zip', 'Do not zip up the package')
+	.option('--no-docs', 'Do not produce docs')
 	.parse(process.argv);
 
-console.log(process.argv);
-console.log(program.skipZip);
 let platforms = program.args;
 let oses = [];
 
@@ -60,11 +59,19 @@ git.getHash(path.join(__dirname, '..'), function (err, hash) {
 	program.timestamp = utils.timestamp();
 	console.log('Packaging MobileSDK (%s)...', versionTag);
 
-	new Documentation(outputDir).generate(function (err) {
+	async.series([
+		function (next) {
+			if (!program.docs) {
+				return next();
+			}
+			new Documentation(outputDir).generate(next);
+		}
+	], function (err) {
 		if (err) {
 			console.error(err);
 			process.exit(1);
 		}
+
 		// Now package for each OS.
 		// MUST RUN IN SERIES - this all runs in same directory, so running in
 		// parallel for each OS would cause all sorts of collisions right now.

package.json

@@ -20,10 +20,10 @@
   "scripts": {
     "test": "npm run ios-sanity-check && grunt",
     "android": "./build/scons cleanbuild android",
-    "android-test": "./build/scons clean android && ./build/scons build android && ./build/scons package -s android && ./build/scons install -s && ti sdk select $npm_package_version && ./build/scons test -s android",
+    "android-test": "./build/scons clean android && ./build/scons build android && ./build/scons package -s --no-docs android && ./build/scons install -s && ti sdk select $npm_package_version && ./build/scons test -s android",
     "ios": "./build/scons cleanbuild ios",
     "ios-sanity-check": "./build/scons check-ios-toplevel",
-    "ios-test": "./build/scons clean ios && ./build/scons build ios && ./build/scons package -s ios && ./build/scons install -s && ti sdk select $npm_package_version && ./build/scons test -s ios",
+    "ios-test": "./build/scons clean ios && ./build/scons build ios && ./build/scons package -s --no-docs ios && ./build/scons install -s && ti sdk select $npm_package_version && ./build/scons test -s ios",
     "commit": "git-cz"
   },
   "husky": {

support/module/packaged/modules.json

@@ -5,8 +5,8 @@
 			"integrity": "sha512-q7IPaAjg8wpQH5lRyABMpZpQT5HxUgbHmdYT91Be0zGFOtqiQ0VUAn396gnp90+dTOnlKVWVsJQ9EyVHwtotCw=="
 		},
 		"facebook": {
-			"url": "https://github.com/appcelerator-modules/ti.facebook/releases/download/ios-5.9.0/facebook-iphone-5.9.0.zip",
-			"integrity": "sha512-CcZuh+yn/ed4+dvOlASJhcbghvSGnH84meolnzWiSnxBs4CRkCQcVN9L3rQsI3AlWG9j4Xrdb9ocFY5K4z3TVg=="
+			"url": "https://github.com/appcelerator-modules/ti.facebook/releases/download/ios-6.0.0/facebook-iphone-6.0.0.zip",
+			"integrity": "sha512-SgXiave5OyG5xL74GYHsMJ5m51JwCWGxf9Umtwea8KXVB+OEtm6LYWOTAThsuqrT15NNZVDZtdUihsGsc7xSmw=="
 		},
 		"ti.coremotion": {
 			"url": "https://github.com/appcelerator-modules/ti.coremotion/releases/download/v2.0.1/ti.coremotion-iphone-2.0.1.zip",
@@ -35,12 +35,12 @@
 	},
 	"android": {
 		"facebook": {
-			"url": "https://github.com/appcelerator-modules/ti.facebook/releases/download/android-7.3.1/facebook-android-7.3.1.zip",
-			"integrity": "sha512-fuEZOeMqHzDHNV9rpVYz5LqVOpnCya0cVu032BZzO1HhvJ2hmFl2c7xj11qlXqxQL6Ad3c/X6WmBPzi4ESudcQ=="
+			"url": "https://github.com/appcelerator-modules/ti.facebook/releases/download/android-8.0.0/facebook-android-8.0.0.zip",
+			"integrity": "sha512-LM73iq9PPV9qqW4dXU0bgZkNJwnIyRft6CWN6bON1HgHS5e6KD0xjvjRk2sWAgvEXE+FazDCRZ5e14SUN+T2Fg=="
 		},
 		"ti.cloudpush": {
-			"url": "https://s3.amazonaws.com/timobile.appcelerator.com/modules/ti.cloudpush-android-5.2.0.zip",
-			"integrity": "sha512-4TNH0K/rDUA7MOwNaieLiklG7aUkckpdr2H2tK3iaBevRZtO7MTGaSS/oNgi0KL9z2RreuAzRwdOs9vW3Z9IZA=="
+			"url": "https://downloads.platform.axway.com/modules/ti.cloudpush-android-6.0.0.zip",
+			"integrity": "sha512-eqInObySn1gn2A+DMJ67RiXTXiTouvVuffTu5a7SWGLAo7Ubg5dSp+HM0b4PdLlFUfoF8VJHTGoTqH62+QpuyQ=="
 		},
 		"ti.map": {
 			"url": "https://github.com/appcelerator-modules/ti.map/releases/download/android-4.3.1/ti.map-android-4.3.1.zip",