@nativescript/visionos 9.0.1 → 9.1.0-alpha.11

package/framework/__PROJECT_NAME__.xcodeproj/project.pbxproj

@@ -7,8 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		39940D9122C4EF600050DDE1 /* NativeScript.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 39940D8C22C4EAAA0050DDE1 /* NativeScript.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		39940E1C22C5DFFF0050DDE1 /* TKLiveSync.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 39940E1B22C5DFFF0050DDE1 /* TKLiveSync.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		AA10000000000000000000C1 /* NativeScriptVisionOS in Frameworks */ = {isa = PBXBuildFile; productRef = AA10000000000000000000B1 /* NativeScriptVisionOS */; };
 		858B842D18CA22B800AB12DE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 858B833A18CA111C00AB12DE /* InfoPlist.strings */; };
 		AAA0AADB2A54B96B00EE55A4 /* NativeScriptStart.m in Sources */ = {isa = PBXBuildFile; fileRef = AAA0AADA2A54B96B00EE55A4 /* NativeScriptStart.m */; };
 		CD45EE7C18DC2D5800FB50C0 /* app in Resources */ = {isa = PBXBuildFile; fileRef = CD45EE7A18DC2D5800FB50C0 /* app */; };
@@ -21,8 +20,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				39940D9122C4EF600050DDE1 /* NativeScript.xcframework in Embed Frameworks */,
-				39940E1C22C5DFFF0050DDE1 /* TKLiveSync.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -34,8 +31,6 @@
 		391174B721F1D99900BA2583 /* plugins-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "plugins-release.xcconfig"; sourceTree = SOURCE_ROOT; };
 		391174B821F1D99900BA2583 /* plugins-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "plugins-debug.xcconfig"; sourceTree = SOURCE_ROOT; };
 		39940D8122C4E84C0050DDE1 /* __PROJECT_NAME__.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = __PROJECT_NAME__.entitlements; sourceTree = "<group>"; };
-		39940D8C22C4EAAA0050DDE1 /* NativeScript.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = NativeScript.xcframework; path = internal/NativeScript.xcframework; sourceTree = "<group>"; };
-		39940E1B22C5DFFF0050DDE1 /* TKLiveSync.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = TKLiveSync.xcframework; path = internal/TKLiveSync.xcframework; sourceTree = "<group>"; };
 		42C751E2232B769100186695 /* nativescript-pre-link */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "nativescript-pre-link"; path = "internal/nativescript-pre-link"; sourceTree = SOURCE_ROOT; };
 		42C751E3232B769100186695 /* strip-dynamic-framework-architectures.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "strip-dynamic-framework-architectures.sh"; path = "internal/strip-dynamic-framework-architectures.sh"; sourceTree = SOURCE_ROOT; };
 		42C751E4232B769100186695 /* nsld.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = nsld.sh; path = internal/nsld.sh; sourceTree = SOURCE_ROOT; };
@@ -61,6 +56,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AA10000000000000000000C1 /* NativeScriptVisionOS in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,8 +108,6 @@
 		858B833018CA111C00AB12DE /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				39940E1B22C5DFFF0050DDE1 /* TKLiveSync.xcframework */,
-				39940D8C22C4EAAA0050DDE1 /* NativeScript.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -173,6 +167,9 @@
 			dependencies = (
 			);
 			name = __PROJECT_NAME__;
+			packageProductDependencies = (
+				AA10000000000000000000B1 /* NativeScriptVisionOS */,
+			);
 			productName = JDBridgeApp;
 			productReference = 858B843318CA22B800AB12DE /* __PROJECT_NAME__.app */;
 			productType = "com.apple.product-type.application";
@@ -203,6 +200,9 @@
 				Base,
 			);
 			mainGroup = 858B832518CA111C00AB12DE;
+			packageReferences = (
+				AA10000000000000000000A1 /* XCRemoteSwiftPackageReference "ios-spm" */,
+			);
 			productRefGroup = 858B832F18CA111C00AB12DE /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -504,6 +504,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		AA10000000000000000000A1 /* XCRemoteSwiftPackageReference "ios-spm" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/NativeScript/ios-spm.git";
+			requirement = {
+				kind = exactVersion;
+				version = "9.1.0-alpha.11";
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		AA10000000000000000000B1 /* NativeScriptVisionOS */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = AA10000000000000000000A1 /* XCRemoteSwiftPackageReference "ios-spm" */;
+			productName = NativeScriptVisionOS;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 858B832618CA111C00AB12DE /* Project object */;
 }

package/framework/internal/metadata-generator-arm64/bin/build-step-metadata-generator.py

@@ -89,14 +89,10 @@ deployment_target = env(env_or_empty("DEPLOYMENT_TARGET_CLANG_ENV_NAME") or defa
 std = env("GCC_C_LANGUAGE_STANDARD")
 header_search_paths = env_or_empty("HEADER_SEARCH_PATHS")
 header_search_paths_parsed = map_and_list((lambda s: "-I" + s), shlex.split(header_search_paths))
-framework_search_paths = env_or_empty("FRAMEWORK_SEARCH_PATHS")
+framework_search_paths = shlex.split(env_or_empty("FRAMEWORK_SEARCH_PATHS"))
 # Add extra framework search path for newer Xcode versions
-extra_framework_path = os.path.join(sdk_root, "System/Library/SubFrameworks")
-if framework_search_paths:
-    framework_search_paths += " " + extra_framework_path
-else:
-    framework_search_paths = extra_framework_path
-framework_search_paths_parsed = map_and_list((lambda s: "-F" + s), shlex.split(framework_search_paths))
+framework_search_paths.append(os.path.join(sdk_root, "System/Library/SubFrameworks"))
+framework_search_paths_parsed = map_and_list((lambda s: "-F" + s), framework_search_paths)
 other_cflags = env_or_empty("OTHER_CFLAGS")
 other_cflags_parsed = shlex.split(other_cflags)
 enable_modules = env_bool("CLANG_ENABLE_MODULES")

package/framework/internal/metadata-generator-x86_64/bin/build-step-metadata-generator.py

@@ -89,14 +89,10 @@ deployment_target = env(env_or_empty("DEPLOYMENT_TARGET_CLANG_ENV_NAME") or defa
 std = env("GCC_C_LANGUAGE_STANDARD")
 header_search_paths = env_or_empty("HEADER_SEARCH_PATHS")
 header_search_paths_parsed = map_and_list((lambda s: "-I" + s), shlex.split(header_search_paths))
-framework_search_paths = env_or_empty("FRAMEWORK_SEARCH_PATHS")
+framework_search_paths = shlex.split(env_or_empty("FRAMEWORK_SEARCH_PATHS"))
 # Add extra framework search path for newer Xcode versions
-extra_framework_path = os.path.join(sdk_root, "System/Library/SubFrameworks")
-if framework_search_paths:
-    framework_search_paths += " " + extra_framework_path
-else:
-    framework_search_paths = extra_framework_path
-framework_search_paths_parsed = map_and_list((lambda s: "-F" + s), shlex.split(framework_search_paths))
+framework_search_paths.append(os.path.join(sdk_root, "System/Library/SubFrameworks"))
+framework_search_paths_parsed = map_and_list((lambda s: "-F" + s), framework_search_paths)
 other_cflags = env_or_empty("OTHER_CFLAGS")
 other_cflags_parsed = shlex.split(other_cflags)
 enable_modules = env_bool("CLANG_ENABLE_MODULES")

package/framework/internal/nativescript-build.xcconfig

@@ -1,6 +1,9 @@
 // * NativeScript build related flags
 // * Add [sdk=*] after each one to avoid conflict with CocoaPods flags
-OTHER_LDFLAGS[sdk=*] = $(inherited) -ObjC -sectcreate __DATA __TNSMetadata "$(CONFIGURATION_BUILD_DIR)/metadata-$(CURRENT_ARCH).bin" -framework NativeScript -framework TKLiveSync -F"$(SRCROOT)/internal" -licucore -lz -lc++ -framework Foundation -framework UIKit -framework CoreGraphics -framework CoreServices -framework Security
+// * NativeScript + TKLiveSync are provided by the SwiftPM "NativeScriptVisionOS" product
+// * (github.com/NativeScript/ios-spm); SwiftPM links/embeds them automatically. The
+// * explicit -framework NativeScript / -framework TKLiveSync / -F internal are omitted.
+OTHER_LDFLAGS[sdk=*] = $(inherited) -ObjC -sectcreate __DATA __TNSMetadata "$(CONFIGURATION_BUILD_DIR)/metadata-$(CURRENT_ARCH).bin" -licucore -lz -lc++ -framework Foundation -framework UIKit -framework CoreGraphics -framework CoreServices -framework Security
 
 // We need to add CONFIGURATION_BUILD_DIR here so that we can explicitly quote-escape any paths in it, because the implicitly added path by Xcode is not always escaped
 FRAMEWORK_SEARCH_PATHS[sdk=*] = $(inherited) "$(SRCROOT)/internal/" "$(CONFIGURATION_BUILD_DIR)"

package/framework/internal/nsld.sh

@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 source ./.build_env_vars.sh
 
-MODULES_DIR="$SRCROOT/internal/Swift-Modules"
-
-function DELETE_SWIFT_MODULES_DIR() {
-    rm -rf "$MODULES_DIR"
-}
-
 function getArch() {
     while [[ $# -gt 0 ]]
     do
@@ -24,6 +18,21 @@ function getArch() {
     done
 }
 
+# Workaround for ARCH being set to `undefined_arch` here. Extract it from command line arguments.
+TARGET_ARCH=$(getArch "$@")
+
+if [ -z "$TARGET_ARCH" ]; then
+    echo "NSLD: Failed to determine target architecture from arguments: $*" >&2
+    exit 1
+fi
+
+# Use per-architecture directory to avoid race conditions with parallel linker invocations
+MODULES_DIR="$SRCROOT/internal/Swift-Modules-$TARGET_ARCH"
+
+function DELETE_SWIFT_MODULES_DIR() {
+    rm -rf "$MODULES_DIR"
+}
+
 function GEN_MODULEMAP() {
     ARCH_ARG=$1
     SWIFT_HEADER_DIR=$PER_VARIANT_OBJECT_FILE_DIR/$ARCH_ARG
@@ -52,9 +61,8 @@ function GEN_METADATA() {
     popd
 }
 
-# Workaround for ARCH being set to `undefined_arch` here. Extract it from command line arguments.
-TARGET_ARCH=$(getArch "$@")
 GEN_MODULEMAP $TARGET_ARCH
+export OTHER_CFLAGS="${OTHER_CFLAGS:+$OTHER_CFLAGS }-fmodule-map-file=\"$MODULES_DIR/module.modulemap\""
 printf "Generating metadata..."
 GEN_METADATA $TARGET_ARCH
 DELETE_SWIFT_MODULES_DIR

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nativescript/visionos",
   "description": "NativeScript Runtime for visionOS",
-  "version": "9.0.1",
+  "version": "9.1.0-alpha.11",
   "keywords": [
     "NativeScript",
     "iOS",