fix: xcode-12.3 build

Author: m-abs

native-src/build-ios.sh

@@ -5,21 +5,61 @@ set -e
 # Based on https://appspector.com/blog/xcframeworks
 
 ROOT_DIR="$(git rev-parse --show-toplevel)"
-NOTA_WEBVIEW_DIR="${ROOT_DIR}/native-src/ios/NotaWebViewExt"
-TARGET="${ROOT_DIR}/src/platforms/ios/NotaWebViewExt.xcframework"
 
-cd $NOTA_WEBVIEW_DIR
+PROJECT_NAME="NotaWebViewExt"
 
-rm -rf $TARGET
+# set framework folder name
+FRAMEWORK_FOLDER_NAME="${PROJECT_NAME}"
 
-# Archive for iOS
-xcodebuild archive -scheme NotaWebViewExt -destination="iOS" -archivePath /tmp/xcf/ios.xcarchive -derivedDataPath /tmp/iphoneos -sdk iphoneos SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
+IOS_PROJECT_DIR="${ROOT_DIR}/native-src/ios/${FRAMEWORK_FOLDER_NAME}"
 
-# Archive for simulator
-xcodebuild archive -scheme NotaWebViewExt -destination="iOS Simulator" -archivePath /tmp/xcf/iossimulator.xcarchive -derivedDataPath /tmp/iphoneos -sdk iphonesimulator SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
+cd ${IOS_PROJECT_DIR}
 
-# Build xcframework with two archives
-xcodebuild -create-xcframework -framework /tmp/xcf/ios.xcarchive/Products/Library/Frameworks/NotaWebViewExt.framework -framework /tmp/xcf/iossimulator.xcarchive/Products/Library/Frameworks/NotaWebViewExt.framework -output $TARGET
+# set framework name or read it from project by this variable
+FRAMEWORK_NAME="${PROJECT_NAME}"
+
+# xcframework path
+FRAMEWORK_PATH="${ROOT_DIR}/src/platforms/ios/${FRAMEWORK_NAME}.xcframework"
+
+TMP_DIR="/tmp/xcf"
+
+# set path for iOS simulator archive
+SIMULATOR_ARCHIVE_PATH="${TMP_DIR}/${FRAMEWORK_FOLDER_NAME}/simulator.xcarchive"
+
+# set path for iOS device archive
+IOS_DEVICE_ARCHIVE_PATH="${TMP_DIR}/${FRAMEWORK_FOLDER_NAME}/iOS.xcarchive"
+
+ARCHIVE_SUBPATH="Products/Library/Frameworks/${FRAMEWORK_NAME}.framework"
+
+rm -rf "${TMP_DIR}" "${FRAMEWORK_PATH}"
+
+echo "Deleted ${TMP_DIR}"
+
+echo "Archiving ${FRAMEWORK_NAME}"
+
+xcodebuild archive \
+  -scheme "${FRAMEWORK_NAME}" \
+  -destination="generic/platform=iOS Simulator" \
+  -archivePath "${SIMULATOR_ARCHIVE_PATH}" \
+  -sdk iphonesimulator \
+  SKIP_INSTALL=NO \
+  BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
+
+xcodebuild archive \
+  -scheme "${FRAMEWORK_FOLDER_NAME}" \
+  -destination="generic/platform=iOS" \
+  -archivePath "${IOS_DEVICE_ARCHIVE_PATH}" \
+  -sdk iphoneos \
+  SKIP_INSTALL=NO \
+  BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
+
+# Creating XCFramework
+xcodebuild -create-xcframework \
+  -framework "${SIMULATOR_ARCHIVE_PATH}/${ARCHIVE_SUBPATH}" \
+  -framework "${IOS_DEVICE_ARCHIVE_PATH}/${ARCHIVE_SUBPATH}" \
+  -output "${FRAMEWORK_PATH}"
+
+rm -rf "${SIMULATOR_ARCHIVE_PATH}" "${IOS_DEVICE_ARCHIVE_PATH}"
 
 ## Workaround for https://github.com/Notalib/nativescript-webview-ext/issues/71
-rm -rf ${TARGET}/ios-armv7_arm64/NotaWebViewExt.framework/Frameworks
+rm -rf ${FRAMEWORK_PATH}/ios-*/NotaWebViewExt.framework/Frameworks

native-src/ios/NotaWebViewExt/NotaWebViewExt.xcodeproj/project.pbxproj

@@ -290,7 +290,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "arm64 arm64e armv7 armv7s i386";
+				VALID_ARCHS = "arm64 arm64e armv7 armv7s i386 x86_64";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -354,7 +354,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "arm64 arm64e armv7 armv7s i386";
+				VALID_ARCHS = "arm64 arm64e armv7 armv7s i386 x86_64";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

src/platforms/ios/NotaWebViewExt.xcframework/Info.plist

@@ -6,31 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-armv7_arm64</string>
+			<string>ios-arm64_i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>NotaWebViewExt.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>armv7</string>
 				<string>arm64</string>
+				<string>i386</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-i386_x86_64-simulator</string>
+			<string>ios-arm64_armv7</string>
 			<key>LibraryPath</key>
 			<string>NotaWebViewExt.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>i386</string>
-				<string>x86_64</string>
+				<string>arm64</string>
+				<string>armv7</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

src/platforms/ios/NotaWebViewExt.xcframework/ios-armv7_arm64/NotaWebViewExt.framework/Headers/NotaWebViewExt-Swift.h renamed to src/platforms/ios/NotaWebViewExt.xcframework/ios-arm64_armv7/NotaWebViewExt.framework/Headers/NotaWebViewExt-Swift.h

@@ -1,6 +1,8 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51)
+// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
+#ifndef NOTAWEBVIEWEXT_SWIFT_H
+#define NOTAWEBVIEWEXT_SWIFT_H
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgcc-compat"
 
@@ -228,9 +230,12 @@ SWIFT_CLASS("_TtC14NotaWebViewExt22CustomUrlSchemeHandler") SWIFT_AVAILABILITY(i
 # pragma clang attribute pop
 #endif
 #pragma clang diagnostic pop
+#endif
 
 #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__
-// Generated by Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51)
+// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
+#ifndef NOTAWEBVIEWEXT_SWIFT_H
+#define NOTAWEBVIEWEXT_SWIFT_H
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgcc-compat"
 
@@ -458,5 +463,6 @@ SWIFT_CLASS("_TtC14NotaWebViewExt22CustomUrlSchemeHandler") SWIFT_AVAILABILITY(i
 # pragma clang attribute pop
 #endif
 #pragma clang diagnostic pop
+#endif
 
 #endif

src/platforms/ios/NotaWebViewExt.xcframework/ios-armv7_arm64/NotaWebViewExt.framework/Headers/NotaWebViewExt.h renamed to src/platforms/ios/NotaWebViewExt.xcframework/ios-arm64_armv7/NotaWebViewExt.framework/Headers/NotaWebViewExt.h

@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51)
+// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
 // swift-module-flags: -target armv7-apple-ios9.3 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name NotaWebViewExt
 import Foundation
 @_exported import NotaWebViewExt

src/platforms/ios/NotaWebViewExt.xcframework/ios-armv7_arm64/NotaWebViewExt.framework/Info.plist renamed to src/platforms/ios/NotaWebViewExt.xcframework/ios-arm64_armv7/NotaWebViewExt.framework/Info.plist

@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51)
+// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
 // swift-module-flags: -target arm64-apple-ios9.3 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name NotaWebViewExt
 import Foundation
 @_exported import NotaWebViewExt

src/platforms/ios/NotaWebViewExt.xcframework/ios-armv7_arm64/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm.swiftdoc renamed to src/platforms/ios/NotaWebViewExt.xcframework/ios-arm64_armv7/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm.swiftdoc

@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51)
+// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
 // swift-module-flags: -target arm64-apple-ios9.3 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name NotaWebViewExt
 import Foundation
 @_exported import NotaWebViewExt

src/platforms/ios/NotaWebViewExt.xcframework/ios-armv7_arm64/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm.swiftinterface renamed to src/platforms/ios/NotaWebViewExt.xcframework/ios-arm64_armv7/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm.swiftinterface

@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51)
+// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
 // swift-module-flags: -target armv7-apple-ios9.3 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name NotaWebViewExt
 import Foundation
 @_exported import NotaWebViewExt

src/platforms/ios/NotaWebViewExt.xcframework/ios-armv7_arm64/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm64-apple-ios.swiftdoc renamed to src/platforms/ios/NotaWebViewExt.xcframework/ios-arm64_armv7/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm64-apple-ios.swiftdoc

@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51)
+// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28)
 // swift-module-flags: -target armv7-apple-ios9.3 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name NotaWebViewExt
 import Foundation
 @_exported import NotaWebViewExt