Merge branch 'master' into TIMOB-26908

tidev · Mar 29, 2019 · b21a3b9 · b21a3b9
2 parents 3b959e0 + 1d456b2
commit b21a3b9
Show file tree

Hide file tree

Showing 41 changed files with 1,718 additions and 1,741 deletions.
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
@@ -2829,6 +2829,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 			// Note: An empty array indicates the app has no bootstrap files.
 			const bootstrapJsonRelativePath = path.join('ti.internal', 'bootstrap.json'),
 				bootstrapJsonAbsolutePath = path.join(buildAssetsPath, bootstrapJsonRelativePath);
+			fs.ensureDirSync(path.dirname(bootstrapJsonAbsolutePath));
 			fs.writeFileSync(bootstrapJsonAbsolutePath, JSON.stringify({ scripts: jsBootstrapFiles }));
 			this.encryptJS && jsFilesToEncrypt.push(bootstrapJsonRelativePath);
 			delete this.lastBuildFiles[bootstrapJsonAbsolutePath];

diff --git a/android/runtime/v8/src/java/org/appcelerator/kroll/runtime/v8/V8Runtime.java b/android/runtime/v8/src/java/org/appcelerator/kroll/runtime/v8/V8Runtime.java
@@ -96,7 +96,7 @@ public void initRuntime()
 			jsDebugger = new JSDebugger(deployData.getDebuggerPort(), application.getSDKVersion());
 		}
 
-		nativeInit(jsDebugger, DBG, deployData.isProfilerEnabled());
+		nativeInit(jsDebugger, DBG, false);
 
 		if (jsDebugger != null) {
 			jsDebugger.start();

diff --git a/apidoc/Titanium/Network/HTTPClient.yml b/apidoc/Titanium/Network/HTTPClient.yml
@@ -482,6 +482,8 @@ properties:
 
   - name: timeout
     summary: Timeout in milliseconds when the connection should be aborted.
+    default: |
+        On iOS, the default is 15000 (15 seconds).
     type: Number
 
   - name: username

diff --git a/build/android.js b/build/android.js
diff --git a/build/ant.js b/build/ant.js
diff --git a/build/docs.js b/build/docs.js
diff --git a/build/git.js b/build/git.js