Merge branch 'master' into TIMOB-27350_1

Jenkinsfile

@@ -108,6 +108,8 @@ def androidUnitTests(nodeVersion, npmVersion, testSuiteBranch, testOnDevices) {
 			try {
 				def zipName = setupTestSuite(testSuiteBranch)
 				// Now run the unit test suite
+				// FIXME: Use "npm run test:android -- -b ../../${zipName}" (and additional args based on device/emulator)
+				// We'd need some way to expose the gathering of crash reports/killing app via adb-all.sh in test suite repo!
 				dir('titanium-mobile-mocha-suite') {
 					nodejs(nodeJSInstallationName: "node ${nodeVersion}") {
 						ensureNPM(npmVersion)
@@ -171,6 +173,8 @@ def iosUnitTests(deviceFamily, nodeVersion, npmVersion, testSuiteBranch) {
 			try {
 				def zipName = setupTestSuite(testSuiteBranch)
 				// Now run the unit test suite
+				// FIXME: Use "npm run test:${deviceFamily} -- -D test -b ../../${zipName}"
+				// we'd need to not clone the suite and copy tests in "setupTestSuite"
 				dir('titanium-mobile-mocha-suite') {
 					nodejs(nodeJSInstallationName: "node ${nodeVersion}") {
 						ensureNPM(npmVersion)
@@ -320,26 +324,29 @@ timestamps {
 					basename = "dist/mobilesdk-${vtag}"
 					echo "BASENAME:        ${basename}"
 
-					// TODO parallelize the iOS/Android/Mobileweb/Windows portions?
-					dir('build') {
+					// TODO parallelize the iOS/Android/Windows portions?
+					ansiColor('xterm') {
 						timeout(15) {
+							def buildCommand = "npm run 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}"
+								buildCommand += ' --all'
 							}
+							sh buildCommand
 							recordIssues(tools: [clang(), java()])
 						} // timeout
-						ansiColor('xterm') {
-							timeout(15) {
-								if (includeWindows) {
-									sh "node scons.js package --version-tag ${vtag} --all"
-								} else {
-									sh "node scons.js package android ios --version-tag ${vtag}"
-								}
-							} // timeout
-						} // ansiColor
-					} // dir
+						timeout(15) {
+							def packageCommand = "npm run package -- --version-tag ${vtag}"
+							if (includeWindows) {
+								// on mainline builds, include windows sdk, build for all 3 host OSes
+								packageCommand += ' --all'
+							} else {
+								// On PRs, just build android and ios for macOS
+								packageCommand += ' android ios'
+							}
+							sh packageCommand
+						} // timeout
+					} // ansiColor
+
 					archiveArtifacts artifacts: "${basename}-*.zip"
 					stash includes: 'dist/parity.html', name: 'parity'
 					stash includes: 'tests/', name: 'override-tests'

README.md

@@ -16,21 +16,37 @@ see the LICENSE file for specific details.
 
 [![Greenkeeper badge](https://badges.greenkeeper.io/appcelerator/titanium_mobile.svg)](https://greenkeeper.io/)
 
-1. [Features](#features)
-2. [Hyperloop](#hyperloop)
-3. [Alloy](#alloy)
-4. [Getting Help](#getting-help)
-    * [Official Documentation, Tutorials and Videos](#official-documentation-tutorials-and-videos)
-    * [Developer Community](#developer-community)
-    * [Video Tutorials](#video-tutorials)
-    * [Slack](#slack)
-    * [Twitter](#twitter)
-    * [Blog](#blog)
-    * [Commercial Support, Licensing](#commercial-support-licensing)
-5. [Contributing](#contributing)
-6. [Building Locally](#building-locally)
-    * [Unit Tests](#unit-tests)
-7. [Legal Stuff](#legal-stuff)
+- [Table of Contents](#table-of-contents)
+  - [Features](#features)
+  - [Hyperloop](#hyperloop)
+    - [Features](#features-1)
+      - [Cross-Platform Reuse](#cross-platform-reuse)
+      - [Direct API Access](#direct-api-access)
+      - [JavaScript Everywhere](#javascript-everywhere)
+      - [3rd-Party Libraries](#3rd-party-libraries)
+      - [Custom Animations](#custom-animations)
+      - [Run Native](#run-native)
+    - [Example](#example)
+    - [Getting Started](#getting-started)
+  - [Alloy](#alloy)
+    - [Example](#example-1)
+  - [Getting Help](#getting-help)
+    - [Official Documentation, Tutorials and Videos](#official-documentation-tutorials-and-videos)
+    - [Developer Community](#developer-community)
+    - [Video Tutorials](#video-tutorials)
+    - [Slack](#slack)
+    - [Twitter](#twitter)
+    - [Blog](#blog)
+    - [Commercial Support, Licensing](#commercial-support-licensing)
+  - [Contributing](#contributing)
+  - [Building Locally](#building-locally)
+    - [Unit tests](#unit-tests)
+      - [How it works](#how-it-works)
+      - [How to modify the tests locally and in your PRs](#how-to-modify-the-tests-locally-and-in-your-prs)
+        - [Adding a new test suite](#adding-a-new-test-suite)
+        - [Editing an existing test suite](#editing-an-existing-test-suite)
+        - [Merging the modified tests back to the common suite](#merging-the-modified-tests-back-to-the-common-suite)
+  - [Legal Stuff](#legal-stuff)
 
 ## Features
 
@@ -209,9 +225,8 @@ Previously Titanium used scons and python scripts to build the SDK.
 If you'd like to build the SDK locally, we've replaced scons with some Node.JS scripts. Typical usage would be:
 
 ```bash
-npm install
-cd build
-node scons.js cleanbuild --android-ndk /opt/android-ndk --android-sdk /opt/android-sdk
+npm ci
+npm run cleanbuild
 ```
 
 The build and package commands will default to all target platforms on your host OS unless explicitly specified. (i.e. Android, iOS on macOS; Windows and Android on Windows). It will compile, package and install the locally-built SDK for you
@@ -222,20 +237,20 @@ The build command will look for Android NDK and SDK using $ANDROID_NDK and $ANDR
 You can use the `-h` flag to display the full list of comands and options.
 
 ```bash
-npm install
-cd build
-node scons.js cleanbuild [platform1] [platform2] --android-ndk /opt/android-ndk --android-sdk /opt/android-sdk /Users/build/android-sdk-macosx
+npm ci
+npm run cleanbuild -- [platform1] [platform2] --android-ndk /opt/android-ndk --android-sdk /opt/android-sdk /Users/build/android-sdk-macosx
 ```
 
 ### Unit tests
 
 We have a [common unit test suite](https://github.com/appcelerator/titanium-mobile-mocha-suite) intended to run across all supported platforms.
 
-To invoke the tests, you must create a local build of the sdk via the steps above and have an sdk zip in your `dist` directory. Then you'd run:
+We have npm scripts set up to run a full clean, build, package, symlinked install, `ti sdk select` the built sdk, and then run the unit test suite:
 
 ```bash
-cd build
-node scons.js test [platform]
+npm run test:android
+npm run test:iphone
+npm run test:ipad
 ```
 
 #### How it works
@@ -250,13 +265,9 @@ The `tests` folder acts as an override folder for the common suite. Any files li
 
 ##### Adding a new test suite
 
-In practical terms that means if we need to add new test files, you'd place the new file under `tests/Resources`, and then copy the `titanium-mobile-mocha-suite/Resources/app.js` to `tests/Resources/app.js` and editing the copy to require the new file(s).
+We also have a mechanism in our test suite to auto load any files under `tests/Resources` with the suffix `.addontest.js`. So adding new tests, is simply a matter of creating a file named something like `tests/Resources/ti.namespace.addontest.j
 
-For example, if we want to test a new `Ti.Foo` namespace, we'd create a new test file at `tests/Resources/ti.foo.test.js`. We'd then copy `titanium-mobile-mocha-suite/Resources/app.js` to `tests/Resources/app.js` and add the line:
 
-```javascript
-require('./ti.foo.test')
-```
 
 ##### Editing an existing test suite
 

android/cli/commands/_build.js

@@ -2585,23 +2585,14 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 	const tasks = [
 		// First copy all of the Titanium SDK's core JS files shared by all platforms.
 		function (cb) {
-			// Check if a snapshot has been generated.
-			fs.stat(path.join(this.platformPath, 'native', 'include', 'V8Snapshots.h'), (error, stat) => {
-				// 'V8Snapshot.h' will always exists, check size to determin if a snapshot was generated.
-				if (error || stat.size <= 64) {
-					const src = path.join(this.titaniumSdkPath, 'common', 'Resources', 'android');
-					warnDupeDrawableFolders.call(this, src);
-					_t.logger.debug(__('Copying %s', src.cyan));
-					copyDir.call(this, {
-						src: src,
-						dest: this.buildBinAssetsResourcesDir,
-						ignoreRootDirs: ti.allPlatformNames
-					}, cb);
-					return;
-				}
-				// Do not copy 'common' bundle over, as it is included in our snapshot.
-				return cb();
-			});
+			const src = path.join(this.titaniumSdkPath, 'common', 'Resources', 'android');
+			warnDupeDrawableFolders.call(this, src);
+			_t.logger.debug(__('Copying %s', src.cyan));
+			copyDir.call(this, {
+				src: src,
+				dest: this.buildBinAssetsResourcesDir,
+				ignoreRootDirs: ti.allPlatformNames
+			}, cb);
 		},
 
 		// Next, copy all files in the project's Resources directory,

android/modules/geolocation/src/java/ti/modules/titanium/geolocation/TiLocation.java

@@ -321,26 +321,18 @@ private KrollDict buildReverseGeocodeResponse(JSONObject jsonResponse) throws JS
 
 	private KrollDict buildAddress(JSONObject place)
 	{
-		Log.w(
-			TAG,
-			"GeocodedAddress properties country_code, displayAddress, and zipcode are deprecated in SDK 8.0.0 and will be removed in 9.0.0");
-		Log.w(TAG, "Please replace usage with the respective properties: countryCode, address, and postalCode");
 		KrollDict address = new KrollDict();
 		address.put(TiC.PROPERTY_STREET1, place.optString(TiC.PROPERTY_STREET, ""));
 		address.put(TiC.PROPERTY_STREET, place.optString(TiC.PROPERTY_STREET, ""));
 		address.put(TiC.PROPERTY_CITY, place.optString(TiC.PROPERTY_CITY, ""));
-		address.put(TiC.PROPERTY_REGION1, "");                  // AdminArea
-		address.put(TiC.PROPERTY_REGION2, "");                  // SubAdminArea
-		address.put("zipcode", place.optString("zipcode", "")); // TODO: To be removed in SDK 9.0.0!
+		address.put(TiC.PROPERTY_REGION1, ""); // AdminArea
+		address.put(TiC.PROPERTY_REGION2, ""); // SubAdminArea
 		address.put(TiC.PROPERTY_POSTAL_CODE, place.optString("zipcode", ""));
 		address.put(TiC.PROPERTY_COUNTRY, place.optString(TiC.PROPERTY_COUNTRY, ""));
 		address.put(TiC.PROPERTY_STATE, place.optString(TiC.PROPERTY_STATE, ""));
-		// Replace TiC.PROPERTY_COUNTRY_CODE value with "countryCode" in SDK 9.0.0
-		address.put("countryCode", place.optString(TiC.PROPERTY_COUNTRY_CODE, ""));
-		address.put(TiC.PROPERTY_COUNTRY_CODE, place.optString(TiC.PROPERTY_COUNTRY_CODE, ""));
+		address.put(TiC.PROPERTY_COUNTRY_CODE, place.optString("country_code", ""));
 		address.put(TiC.PROPERTY_LONGITUDE, place.optDouble(TiC.PROPERTY_LONGITUDE, 0.0d));
 		address.put(TiC.PROPERTY_LATITUDE, place.optDouble(TiC.PROPERTY_LATITUDE, 0.0d));
-		address.put(TiC.PROPERTY_DISPLAY_ADDRESS, place.optString(TiC.PROPERTY_ADDRESS));
 		address.put(TiC.PROPERTY_ADDRESS, place.optString(TiC.PROPERTY_ADDRESS));
 
 		return address;

android/modules/network/src/java/ti/modules/titanium/network/socket/TCPProxy.java

@@ -323,7 +323,6 @@ private KrollDict buildErrorCallbackArgs(String error, int errorCode)
 		KrollDict callbackArgs = new KrollDict();
 		callbackArgs.put("socket", this);
 		callbackArgs.putCodeAndMessage(errorCode, error);
-		callbackArgs.put("errorCode", errorCode);
 
 		return callbackArgs;
 	}

android/modules/ui/src/java/ti/modules/titanium/ui/ImageViewProxy.java

@@ -41,7 +41,7 @@ public TiUIView createView(Activity activity)
 	}
 
 	@Override
-	public TiBlob toImage()
+	protected TiBlob handleToImage()
 	{
 		return this.toBlob();
 	}

android/modules/ui/src/java/ti/modules/titanium/ui/android/AndroidModule.java

@@ -93,17 +93,6 @@ public class AndroidModule extends KrollModule
 	@Kroll.constant
 	public static final int SOFT_KEYBOARD_SHOW_ON_FOCUS = TiUIView.SOFT_KEYBOARD_SHOW_ON_FOCUS;
 
-	@Kroll.constant
-	public static final int LINKIFY_ALL = Linkify.ALL;
-	@Kroll.constant
-	public static final int LINKIFY_EMAIL_ADDRESSES = Linkify.EMAIL_ADDRESSES;
-	@Kroll.constant
-	public static final int LINKIFY_MAP_ADDRESSES = Linkify.MAP_ADDRESSES;
-	@Kroll.constant
-	public static final int LINKIFY_PHONE_NUMBERS = Linkify.PHONE_NUMBERS;
-	@Kroll.constant
-	public static final int LINKIFY_WEB_URLS = Linkify.WEB_URLS;
-
 	@Kroll.constant
 	public static final int SWITCH_STYLE_CHECKBOX = 0;
 	@Kroll.constant

android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiWebViewClient.java

@@ -112,9 +112,7 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
 		}
 		KrollDict data = new KrollDict();
 		data.put("url", failingUrl);
-		data.put("errorCode", errorCode);
 		data.putCodeAndMessage(errorCode, description);
-		data.put("message", description);
 		proxy.fireEvent("error", data);
 	}
 

android/titanium/src/java/org/appcelerator/titanium/TiApplication.java

@@ -769,6 +769,35 @@ public boolean isCoverageEnabled()
 		return false;
 	}
 
+	public static void launch()
+	{
+		final TiRootActivity rootActivity = TiApplication.getInstance().getRootActivity();
+		if (rootActivity == null) {
+			return;
+		}
+
+		// Fetch a path to the main script that was last loaded.
+		String appPath = rootActivity.getUrl();
+		if ((appPath == null) || appPath.isEmpty()) {
+			return;
+		}
+		appPath = "Resources/" + appPath;
+
+		final KrollRuntime runtime = KrollRuntime.getInstance();
+		final boolean hasSnapshot = runtime.evalString("global._startSnapshot") != null;
+		if (hasSnapshot) {
+
+			// Snapshot available, start snapshot.
+			runtime.doRunModule("global._startSnapshot(global)", appPath, rootActivity.getActivityProxy());
+
+		} else {
+
+			// Could not find snapshot, fallback to launch script.
+			runtime.doRunModuleBytes(KrollAssetHelper.readAssetBytes(appPath), appPath,
+									 rootActivity.getActivityProxy());
+		}
+	}
+
 	public void softRestart()
 	{
 		// Fetch the root activity hosting the JavaScript runtime.
@@ -795,13 +824,6 @@ public void softRestart()
 			return;
 		}
 
-		// Fetch a path to the main script that was last loaded.
-		String appPath = rootActivity.getUrl();
-		if ((appPath == null) || appPath.isEmpty()) {
-			return;
-		}
-		appPath = "Resources/" + appPath;
-
 		// Prevent termination of root activity.
 		boolean canFinishRoot = TiBaseActivity.canFinishRoot;
 		TiBaseActivity.canFinishRoot = false;
@@ -820,15 +842,7 @@ public void softRestart()
 		runtime.initRuntime();
 
 		// manually re-launch app
-		if (KrollAssetHelper.assetExists(appPath)) {
-			runtime.doRunModuleBytes(KrollAssetHelper.readAssetBytes(appPath), appPath,
-									 rootActivity.getActivityProxy());
-
-			// launch script does not exist, must be using snapshot
-			// execute startup method baked in snapshot
-		} else {
-			runtime.doRunModule("global._startSnapshot(global)", appPath, rootActivity.getActivityProxy());
-		}
+		TiApplication.launch();
 	}
 
 	@Override