Merge branch '8_2_X' into TIMOB-27383_8_2_X

tidev · Sep 20, 2019 · b68880b · b68880b
2 parents 4adede9 + df39a91
commit b68880b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/iphone/cli/commands/_build.js b/iphone/cli/commands/_build.js
@@ -5800,7 +5800,18 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
 				},
 
 				function generateSemanticColors() {
-					const colorsFile = path.join(this.projectDir, 'Resources', 'iphone', 'semantic.colors.json');
+					let colorsFile = path.join(this.projectDir, 'Resources', 'iphone', 'semantic.colors.json');
+
+					if (!fs.existsSync(colorsFile)) {
+						// Fallback to root of Resources folder for Classic applications
+						colorsFile = path.join(this.projectDir, 'Resources', 'semantic.colors.json');
+					}
+
+					if (!fs.existsSync(colorsFile)) {
+						this.logger.debug(__('Skipping colorset generation as "semantic.colors.json" file does not exist'));
+						return;
+					}
+
 					const assetCatalog = path.join(this.buildDir, 'Assets.xcassets');
 					const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
 
@@ -5823,9 +5834,6 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
 						} : null;
 					}
 
-					if (!fs.existsSync(colorsFile)) {
-						return;
-					}
 					const colors = fs.readJSONSync(colorsFile);
 
 					for (const [ color, colorValue ] of Object.entries(colors)) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "titanium-mobile",
   "description": "Appcelerator Titanium Mobile",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "moduleApiVersion": {
     "iphone": "2",
     "android": "4",