[TIMOB-25748] iOS: Remove TiCore in favor of built-in JavaScriptCore

Jenkinsfile

@@ -6,7 +6,7 @@ properties([buildDiscarder(logRotator(numToKeepStr: '15', artifactNumToKeepStr:
 
 // Some branch flags to alter behavior
 def isPR = env.CHANGE_ID || false // CHANGE_ID is set if this is a PR. (We used to look whether branch name started with PR-, which would not be true for a branch from origin filed as PR)
-def MAINLINE_BRANCH_REGEXP = /master|\d_\d_(X|\d)/ // a branch is considered mainline if 'master' or like: 6_2_X, 7_0_X, 6_2_1
+def MAINLINE_BRANCH_REGEXP = /master|next|\d_\d_(X|\d)/ // a branch is considered mainline if 'master' or like: 6_2_X, 7_0_X, 6_2_1
 def isMainlineBranch = (env.BRANCH_NAME ==~ MAINLINE_BRANCH_REGEXP)
 def isGreenKeeper = env.BRANCH_NAME.startsWith('greenkeeper/') || 'greenkeeper[bot]'.equals(env.CHANGE_AUTHOR) // greenkeeper needs special handling to avoid using npm ci, and to use greenkeeper-lockfile
 

android/cli/commands/_build.js

@@ -3888,9 +3888,9 @@ AndroidBuilder.prototype.generateAndroidManifest = function generateAndroidManif
 		if (fs.existsSync(libraryManifestPath)) {
 			let libraryManifestContent = fs.readFileSync(libraryManifestPath).toString();
 
-			// handle injected build variables
+			// handle injected build variables such as ${applicationId}
 			// https://developer.android.com/studio/build/manifest-build-variables
-			libraryManifestContent = libraryManifestContent.replace('${applicationId}', this.appid); // eslint-disable-line no-template-curly-in-string
+			libraryManifestContent = libraryManifestContent.replace(/\$\{applicationId\}/g, this.appid); // eslint-disable-line no-template-curly-in-string
 
 			const libraryManifest = new AndroidManifest();
 			libraryManifest.parse(libraryManifestContent);

android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java

@@ -546,7 +546,7 @@ public void callAsync(KrollObject krollObject, HashMap args)
 					public void callAsync(KrollObject krollObject, Object[] args)
 					{
 						bTransformPending.set(false);
-						proxy.handlePendingAnimation(true);
+						p.handlePendingAnimation(true);
 					}
 				});
 				animBuilder.start(p, v);

build/ios.js

@@ -1,30 +1,16 @@
 'use strict';
 
-const exec = require('child_process').exec, // eslint-disable-line security/detect-child-process
-	path = require('path'),
+const path = require('path'),
 	async = require('async'),
 	fs = require('fs-extra'),
 	utils = require('./utils'),
 	copyFiles = utils.copyFiles,
 	copyAndModifyFile = utils.copyAndModifyFile,
 	copyAndModifyFiles = utils.copyAndModifyFiles,
 	globCopy = utils.globCopy,
-	downloadURL = utils.downloadURL,
 	ROOT_DIR = path.join(__dirname, '..'),
 	IOS_ROOT = path.join(ROOT_DIR, 'iphone'),
-	IOS_LIB = path.join(IOS_ROOT, 'lib'),
-	TI_CORE_VERSION = 24,
-	TI_CORE_INTEGRITY = 'sha512-iTyrzaMs6SfPlyEgO70pg8EW08mn211tjpAI5hAmRHQaZGu1ieuBnT8uEkEYcsO8hdzAFbouqPPEaXWcJH5SLA==';
-
-function gunzip(gzFile, destFile, next) {
-	console.log('Gunzipping ' + gzFile + ' to ' + destFile);
-	exec('gunzip -dc "' + gzFile + '" > "' + destFile + '"', function (err) {
-		if (err) {
-			return next(err);
-		}
-		next();
-	});
-}
+	IOS_LIB = path.join(IOS_ROOT, 'lib');
 
 /**
  * @param {Object} options options object
@@ -43,35 +29,9 @@ IOS.prototype.clean = function (next) {
 	next();
 };
 
-IOS.prototype.fetchLibTiCore = function (next) {
-	const url = 'http://timobile.appcelerator.com.s3.amazonaws.com/libTiCore-' + TI_CORE_VERSION + '.a.gz',
-		dest = path.join(IOS_LIB, 'libTiCore.a'),
-		markerFile = path.join(IOS_LIB, TI_CORE_VERSION.toString() + '.txt');
-
-	// Do we have the latest libTiCore?
-	if (fs.existsSync(dest) && fs.existsSync(markerFile)) {
-		return next();
-	}
-
-	console.log('You don\'t seem to have the appropriate thirdparty files. I\'ll fetch them.');
-	console.log('This could take awhile.. Might want to grab a cup of Joe or make fun of Nolan.');
-
-	downloadURL(url, TI_CORE_INTEGRITY, function (err, file) {
-		if (err) {
-			return next(err);
-		}
-		gunzip(file, dest, function (err) {
-			if (err) {
-				return next(err);
-			}
-			// Place "marker" file
-			fs.writeFile(markerFile, 'DO NOT DELETE THIS FILE', next);
-		});
-	});
-};
-
 IOS.prototype.build = function (next) {
-	this.fetchLibTiCore(next);
+	// no-op (used to fetch TiCore in the past)
+	next();
 };
 
 IOS.prototype.package = function (packager, next) {
@@ -80,17 +40,13 @@ IOS.prototype.package = function (packager, next) {
 	const DEST_IOS = path.join(packager.zipSDKDir, 'iphone');
 
 	async.parallel([
-		this.fetchLibTiCore.bind(this),
 		function (callback) {
 			async.series([
 				function (cb) {
 					globCopy('**/*.h', path.join(IOS_ROOT, 'Classes'), path.join(DEST_IOS, 'include'), cb);
 				},
 				function (cb) {
-					globCopy('**/*.h', path.join(IOS_ROOT, 'headers', 'JavaScriptCore'), path.join(DEST_IOS, 'include', 'JavaScriptCore'), cb);
-				},
-				function (cb) {
-					copyFiles(IOS_ROOT, DEST_IOS, [ 'AppledocSettings.plist', 'Classes', 'cli', 'headers', 'iphone', 'templates' ], cb);
+					copyFiles(IOS_ROOT, DEST_IOS, [ 'AppledocSettings.plist', 'Classes', 'cli', 'iphone', 'templates' ], cb);
 				},
 				// Copy and inject values for special source files
 				function (cb) {
@@ -102,7 +58,7 @@ IOS.prototype.package = function (packager, next) {
 					copyAndModifyFiles(path.join(IOS_ROOT, 'Classes'), path.join(DEST_IOS, 'Classes'), [ 'TopTiModule.m', 'TiApp.m' ], subs, cb);
 				}.bind(this),
 				function (cb) {
-					copyFiles(IOS_LIB, DEST_IOS, [ 'libtiverify.a', 'libti_ios_debugger.a', 'libti_ios_profiler.a' ], cb);
+					copyFiles(IOS_LIB, DEST_IOS, [ 'libtiverify.a' ], cb);
 				},
 				// copy iphone/package.json, but replace __VERSION__ with our version!
 				function (cb) {
@@ -118,8 +74,7 @@ IOS.prototype.package = function (packager, next) {
 		if (err) {
 			return next(err);
 		}
-		// Ensure we've fetched libTiCore before we copy it
-		copyFiles(IOS_LIB, DEST_IOS, [ 'libTiCore.a' ], next);
+		next();
 	});
 };
 

iphone/Classes/APIModule.m

@@ -1,6 +1,6 @@
 /**
  * Appcelerator Titanium Mobile
- * Copyright (c) 2009-2010 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2009-2018 by Appcelerator, Inc. All Rights Reserved.
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
@@ -10,10 +10,6 @@
 #import "TiExceptionHandler.h"
 #import "TiUtils.h"
 
-#ifndef USE_JSCORE_FRAMEWORK
-#import "TiDebugger.h"
-#endif
-
 extern NSString *const TI_APPLICATION_DEPLOYTYPE;
 
 @implementation APIModule
@@ -25,42 +21,7 @@ - (NSString *)apiName
 
 - (void)logMessage:(NSArray *)args severity:(NSString *)severity
 {
-
-#ifndef USE_JSCORE_FRAMEWORK
-  NSString *lcSeverity = [severity lowercaseString];
-  DebuggerLogLevel level = OUT;
-  if ([lcSeverity isEqualToString:@"warn"]) {
-    level = WARN;
-  } else if ([lcSeverity isEqualToString:@"error"] ||
-      [lcSeverity isEqualToString:@"critical"] ||
-      [lcSeverity isEqualToString:@"fatal"]) {
-    level = ERR;
-  } else if ([lcSeverity isEqualToString:@"trace"]) {
-    level = TRACE;
-  } else if ([lcSeverity isEqualToString:@"debug"]) {
-    level = LOG_DEBUG;
-  }
-
-  if ([[TiApp app] debugMode]) {
-    NSMutableArray *messages = [NSMutableArray arrayWithArray:args];
-
-    if (![lcSeverity isEqualToString:@"info"]) { // Custom severity, or just a badly-formed log; either way, debugger treats it as info
-      [messages insertObject:[NSString stringWithFormat:@"[%@]", severity] atIndex:0];
-    }
-
-    TiDebuggerLogMessage(level, [messages componentsJoinedByString:@" "]);
-  } else
-#endif
-  {
-#ifndef USE_JSCORE_FRAMEWORK
-    if ([TI_APPLICATION_DEPLOYTYPE isEqualToString:@"production"]) {
-      if (level != ERR) {
-        return;
-      }
-    }
-#endif
-    NSLog(@"[%@] %@", [severity uppercaseString], [args componentsJoinedByString:@" "]);
-  }
+  NSLog(@"[%@] %@", [severity uppercaseString], [args componentsJoinedByString:@" "]);
 }
 
 - (id)transform:(id)arg

iphone/Classes/KrollBridge.h

@@ -11,8 +11,9 @@
 #import "TiEvaluator.h"
 #import "TiModule.h"
 #import "TiProxy.h"
-#import "TiToJS.h"
+
 #import <Foundation/Foundation.h>
+#import <JavaScriptCore/JavaScriptCore.h>
 #include <libkern/OSAtomic.h>
 
 #ifdef KROLL_COVERAGE