Merge branch 'master' into TIMOB-24277

Jenkinsfile

@@ -27,7 +27,7 @@ def unitTests(os, nodeVersion, testSuiteBranch) {
 				// FIXME Clone once on initial node and use stash/unstash to ensure all OSes use exact same checkout revision
 				dir('titanium-mobile-mocha-suite') {
 					// TODO Do a shallow clone, using same credentials as from scm object
-					git credentialsId: 'd05dad3c-d7f9-4c65-9cb6-19fef98fc440', url: 'https://github.com/appcelerator/titanium-mobile-mocha-suite.git', branch: testSuiteBranch
+					git changelog: false, poll: false, credentialsId: 'd05dad3c-d7f9-4c65-9cb6-19fef98fc440', url: 'https://github.com/appcelerator/titanium-mobile-mocha-suite.git', branch: testSuiteBranch
 				}
 				// copy over any overridden unit tests into this workspace
 				unstash 'override-tests'
@@ -75,7 +75,7 @@ timestamps {
 				dir('..') {
 					sh 'mkdir -p titanium_mobile'
 					dir('titanium_mobile') {
-						checkout([
+						checkout(changelog: false, poll: false, scm: [
 							$class: 'GitSCM',
 							branches: [[name: '**']],
 							extensions: [

android/cli/commands/_buildModule.js

@@ -1153,7 +1153,8 @@ AndroidModuleBuilder.prototype.compileJsClosure = function (next) {
 		}),
 		closureJarFile = path.join(this.platformPath, 'lib', 'closure-compiler.jar');
 
-	jsFilesToEncrypt.forEach(function (file) {
+	// Limit to 5 instances of Java in parallel at max, to be careful/conservative
+	async.eachLimit(jsFilesToEncrypt, 5, function(file, callback) {
 
 		var outputDir = path.dirname(path.join(this.buildGenJsDir, file)),
 			filePath = path.join(this.assetsDir, file);
@@ -1178,11 +1179,9 @@ AndroidModuleBuilder.prototype.compileJsClosure = function (next) {
 				'--jscomp_off=internetExplorerChecks'
 			],
 			{},
-			next
+			callback
 		);
-
-	}, this);
-
+	}.bind(this), next);
 };
 
 /*

android/dev/TitaniumTest/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.titanium.test" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>
-	<application android:icon="@drawable/appicon" android:label="TitaniumTest" android:name="TitaniumtestApplication" android:theme="@style/Theme.AppCompat">
-		<activity android:name=".TitaniumtestActivity" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:configChanges="keyboardHidden|orientation|screenSize">
+	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24"/>
+	<application android:icon="@drawable/appicon" android:label="TitaniumTest" android:name=".TitaniumTestApplication" android:theme="@style/Theme.AppCompat">
+		<activity android:name=".TitaniumTestActivity" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:configChanges="keyboardHidden|orientation|screenSize">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -11,7 +11,9 @@
 		<activity android:name="org.appcelerator.titanium.TiActivity" android:configChanges="keyboardHidden|orientation|screenSize"/>
 		<activity android:name="org.appcelerator.titanium.TiTranslucentActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/Theme.AppCompat.Translucent"/>
 		<activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity" android:configChanges="screenSize"/>
-		<service android:name="com.appcelerator.analytics.APSAnalyticsService" android:exported="false"/>
+		<activity android:name="ti.modules.titanium.media.TiCameraActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/Theme.AppCompat.Translucent.NoTitleBar.Fullscreen"/>
+		<provider android:name="org.appcelerator.titanium.io.TiFileProvider" android:authorities="com.titanium.test.tifileprovider" android:exported="false" android:grantUriPermissions="true"/>
+		<service android:name="com.appcelerator.aps.APSAnalyticsService" android:exported="false"/>
 	</application>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

android/dev/TitaniumTest/src/com/titanium/test/TitaniumtestActivity.java → android/dev/TitaniumTest/src/com/titanium/test/TitaniumTestActivity.java

@@ -2,6 +2,6 @@
 
 import org.appcelerator.titanium.TiRootActivity;
 
-public final class TitaniumtestActivity extends TiRootActivity
+public final class TitaniumTestActivity extends TiRootActivity
 {
 }

android/dev/TitaniumTest/src/com/titanium/test/TitaniumtestAppInfo.java → android/dev/TitaniumTest/src/com/titanium/test/TitaniumTestAppInfo.java

@@ -9,11 +9,11 @@
  * Warning - this class was generated from your application's tiapp.xml
  * Any changes you make here will be overwritten
  */
-public final class TitaniumtestAppInfo implements ITiAppInfo
+public final class TitaniumTestAppInfo implements ITiAppInfo
 {
 	private static final String LCAT = "AppInfo";
 
-	public TitaniumtestAppInfo(TiApplication app) {
+	public TitaniumTestAppInfo(TiApplication app) {
 	}
 
 	public String getDeployType() {

android/dev/TitaniumTest/src/com/titanium/test/TitaniumtestApplication.java → android/dev/TitaniumTest/src/com/titanium/test/TitaniumTestApplication.java

@@ -11,14 +11,14 @@
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiRootActivity;
 
-public final class TitaniumtestApplication extends TiApplication {
-    private static final String TAG = "TitaniumtestApplication";
+public final class TitaniumTestApplication extends TiApplication {
+    private static final String TAG = "TitaniumTestApplication";
 
     @Override
     public void onCreate() {
         super.onCreate();
 
-        appInfo = new TitaniumtestAppInfo(this);
+        appInfo = new TitaniumTestAppInfo(this);
         postAppInfo();
 
         // KrollAssetHelper.setAssetCrypt(new AssetCryptImpl());