Merge pull request #7755 from FokkeZB/TIMOB-19455-hotfix-5_2_X

[TIMOB-19455] Fix WatchOS apps with non alphanum names
tidev · Feb 19, 2016 · fd837d1 · fd837d1
2 parents 8e28ccf + d6da5c0
commit fd837d1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/templates/applewatch/watchos1/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs b/templates/applewatch/watchos1/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs
@@ -326,7 +326,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				IBSC_MODULE = <%= watchkitExtName.replace(/ /g, '_') %>;
+				IBSC_MODULE = <%= watchkitExtName.replace(/[^a-z0-9]+/gi, '_') %>;
 				INFOPLIST_FILE = "<%= watchkitAppName %>/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				PRODUCT_BUNDLE_IDENTIFIER = <%= watchkitExtId %>;
@@ -341,7 +341,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				IBSC_MODULE = <%= watchkitExtName.replace(/ /g, '_') %>;
+				IBSC_MODULE = <%= watchkitExtName.replace(/[^a-z0-9]+/gi, '_') %>;
 				INFOPLIST_FILE = "<%= watchkitAppName %>/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				PRODUCT_BUNDLE_IDENTIFIER = <%= watchkitExtId %>;

diff --git a/templates/applewatch/watchos2-objc/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs b/templates/applewatch/watchos2-objc/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs
@@ -363,7 +363,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
-				IBSC_MODULE = <%= watchkitExtName.replace(/ /g, '_') %>;
+				IBSC_MODULE = <%= watchkitExtName.replace(/[^a-z0-9]+/gi, '_') %>;
 				INFOPLIST_FILE = "<%= watchkitAppName %>/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = <%= watchkitAppId %>;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -379,7 +379,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
-				IBSC_MODULE = <%= watchkitExtName.replace(/ /g, '_') %>;
+				IBSC_MODULE = <%= watchkitExtName.replace(/[^a-z0-9]+/gi, '_') %>;
 				INFOPLIST_FILE = "<%= watchkitAppName %>/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = <%= watchkitAppId %>;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/templates/applewatch/watchos2-swift/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs b/templates/applewatch/watchos2-swift/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs
@@ -357,7 +357,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				IBSC_MODULE = <%= watchkitExtName.replace(/ /g, '_') %>;
+				IBSC_MODULE = <%= watchkitExtName.replace(/[^a-z0-9]+/gi, '_') %>;
 				INFOPLIST_FILE = "<%= watchkitAppName %>/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = <%= watchkitAppId %>;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -373,7 +373,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				IBSC_MODULE = <%= watchkitExtName.replace(/ /g, '_') %>;
+				IBSC_MODULE = <%= watchkitExtName.replace(/[^a-z0-9]+/gi, '_') %>;
 				INFOPLIST_FILE = "<%= watchkitAppName %>/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = <%= watchkitAppId %>;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/templates/applewatch/watchos2/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs b/templates/applewatch/watchos2/template/{{ExtName}}.xcodeproj/project.pbxproj.ejs
@@ -363,7 +363,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
-				IBSC_MODULE = <%= watchkitExtName.replace(/ /g, '_') %>;
+				IBSC_MODULE = <%= watchkitExtName.replace(/[^a-z0-9]+/gi, '_') %>;
 				INFOPLIST_FILE = "<%= watchkitAppName %>/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = <%= watchkitAppId %>;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -379,7 +379,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
-				IBSC_MODULE = <%= watchkitExtName.replace(/ /g, '_') %>;
+				IBSC_MODULE = <%= watchkitExtName.replace(/[^a-z0-9]+/gi, '_') %>;
 				INFOPLIST_FILE = "<%= watchkitAppName %>/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = <%= watchkitAppId %>;
 				PRODUCT_NAME = "$(TARGET_NAME)";