From 7e2afef253492803cf78385e4b45abb3d60ce414 Mon Sep 17 00:00:00 2001
From: Martin Bektchiev <martin.bektchiev@progress.com>
Date: Wed, 14 Aug 2019 17:13:14 +0300
Subject: [PATCH] chore(catalyst): Update build scripts for Xcode 11 beta 5

* Enable Modern build system (Catalyst is unsupported on the Legacy one)
* `UIKit for Mac` is now renamed to `Mac Catalyst`
---
 .../xcshareddata/WorkspaceSettings.xcsettings               | 4 ++--
 tns-core-modules-widgets/ios/build.sh                       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
index 949b67898..f9b0d7c5e 100644
--- a/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/tns-core-modules-widgets/ios/TNSWidgets/TNSWidgets.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BuildSystemType</key>
-	<string>Original</string>
+	<key>PreviewsEnabled</key>
+	<false/>
 </dict>
 </plist>
diff --git a/tns-core-modules-widgets/ios/build.sh b/tns-core-modules-widgets/ios/build.sh
index 121ea76ac..b40b05f04 100755
--- a/tns-core-modules-widgets/ios/build.sh
+++ b/tns-core-modules-widgets/ios/build.sh
@@ -4,7 +4,7 @@ echo "Set exit on simple errors"
 set -e
 
 OUTPUT_DIR="$PWD/TNSWidgets/build"
-rm -rf $OUTPUT_DIR"
+rm -rf "$OUTPUT_DIR"
 
 echo "Build for iphonesimulator"
 xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphonesimulator -configuration Release clean build BUILD_DIR="$OUTPUT_DIR" -quiet
@@ -12,7 +12,7 @@ xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk ipho
 echo "Build for iphoneos"
 xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -sdk iphoneos -configuration Release clean build BUILD_DIR="$OUTPUT_DIR" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -quiet
 
-echo "Build for uikitformac"
+echo "Build for Mac Catalyst"
 xcodebuild -project TNSWidgets/TNSWidgets.xcodeproj -scheme TNSWidgets -destination 'variant=Mac Catalyst,arch=x86_64' -configuration Release clean build BUILD_DIR="$OUTPUT_DIR" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -quiet
 
 function buildFatFramework_iOS() {
@@ -57,7 +57,7 @@ function buildXCFramework() {
 
     SRC_IPHONEOS=TNSWidgets/build/Release-iphoneos/$RELATIVE_DIR/$FRAMEWORK_NAME.framework
     SRC_SIMULATOR=TNSWidgets/build/Release-iphonesimulator/$RELATIVE_DIR/$FRAMEWORK_NAME.framework
-    SRC_MACOS=TNSWidgets/build/Release-uikitformac/$RELATIVE_DIR/$FRAMEWORK_NAME.framework
+    SRC_MACOS=TNSWidgets/build/Release-maccatalyst/$RELATIVE_DIR/$FRAMEWORK_NAME.framework
     OUTPUT_DIR=TNSWidgets/build
     XCFRAMEWORK_PATH=$OUTPUT_DIR/$FRAMEWORK_NAME.xcframework
     IOS_DSYM=$OUTPUT_DIR/$FRAMEWORK_NAME.ios.framework.dSYM