Merge pull request #379 from tidev/fix/xcframework-modules

CHANGELOG.md

@@ -8,6 +8,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ---
 
+## [7.0.5] - 2023-05-20
+
+### Fixed
+
+- iOS: Do not hard-crash build if framework is missing module map (just skip it)
+- CLI: Update Babel
+
 ## [6.0.0] - 2020-09-21
 
 ### Fixed

build.sh

@@ -19,7 +19,7 @@ onexit () {
 
 trap onexit 0 1 2 3 6 9 15
 
-TISDK_SEMVER=">=7.0.0"
+TISDK_SEMVER=">=9.2.0"
 CHECK="✓ "
 
 # Make sure the Android SDK is installed
@@ -30,17 +30,17 @@ then
 		export ANDROID_SDK=~/Library/Android/sdk
 	else
 		echo "Please set ANDROID_SDK environment variable and try again"
-		echo "Download Android SDK from http://developer.android.com/sdk/index.html"
+		echo "Download Android Studio from https://developer.android.com/studio"
 		exit 1
 	fi
 	echo "$CHECK Android SDK is $ANDROID_SDK"
 fi
 
 # Make sure we have at least the Android 7.1 (SDK 25) installed
-if [ ! -d "$ANDROID_SDK/platforms/android-25" ];
+if [ ! -d "$ANDROID_SDK/platforms/android-33" ];
 then
-	echo "Android 7.1 (Lollipop) / (android-25) not installed"
-	echo "Download Android 7.1 using Android Studio"
+	echo "Android 13 (Tiramisu) / (android-33) not installed"
+	echo "Download the Android 13 SDK using Android Studio"
 	exit 1
 fi
 

iphone/hyperloop.xcodeproj/project.pbxproj

@@ -432,7 +432,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "tests/Tests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -449,7 +449,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.appcelerator.hyperloop.tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "tests/Tests-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

iphone/manifest

@@ -4,7 +4,7 @@
 #
 version: VERSION
 apiversion: 2
-architectures: armv7 arm64 i386 x86_64
+architectures: arm64 x86_64
 description: hyperloop
 author: Appcelerator
 license: Appcelerator Commercial License

packages/hyperloop-ios-metabase/lib/metabase.js

@@ -617,9 +617,11 @@ function generateFrameworkIncludeMap (frameworkMetadata, includes, callback) {
 
 	util.logger.trace('Generating includes for ' + frameworkMetadata.type + ' framework ' + frameworkName.green + ' (' + frameworkPath + ')');
 	if (frameworkMetadata.type === 'dynamic') {
+		// Skip if we don't have a "Modules" folder
 		var modulesPath = path.join(frameworkPath, 'Modules');
 		if (!fs.existsSync(modulesPath)) {
-			return callback(new Error(`Modules directory for ${frameworkName} not found at expected path ${modulesPath}.`));
+			includes[frameworkName] = {};
+			return callback();
 		}
 
 		var moduleMapPathAndFilename = path.join(modulesPath, 'module.modulemap');