Skip to content

Commit

Permalink
Compile for visionos
Browse files Browse the repository at this point in the history 
Remove separate macOS target

Co-Authored-By: Aurelius Prochazka <[email protected]>
  • Loading branch information
@wtholliday @aure
wtholliday and aure committed Feb 25, 2024
1 parent c490711 commit c2195af
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 128 deletions.
146 changes: 19 additions & 127 deletions Demo/FlowDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,16 @@

/* Begin PBXBuildFile section */
F1DDBABD28BE927D0009F000 /* FlowDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDBAAD28BE927B0009F000 /* FlowDemoApp.swift */; };
F1DDBABE28BE927D0009F000 /* FlowDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDBAAD28BE927B0009F000 /* FlowDemoApp.swift */; };
F1DDBABF28BE927D0009F000 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDBAAE28BE927B0009F000 /* ContentView.swift */; };
F1DDBAC028BE927D0009F000 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDBAAE28BE927B0009F000 /* ContentView.swift */; };
F1DDBAC128BE927D0009F000 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F1DDBAAF28BE927D0009F000 /* Assets.xcassets */; };
F1DDBAC228BE927D0009F000 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F1DDBAAF28BE927D0009F000 /* Assets.xcassets */; };
F1DDBACF28BE92D00009F000 /* Flow in Frameworks */ = {isa = PBXBuildFile; productRef = F1DDBACE28BE92D00009F000 /* Flow */; };
F1DDBAD128BE93100009F000 /* Flow in Frameworks */ = {isa = PBXBuildFile; productRef = F1DDBAD028BE93100009F000 /* Flow */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
F1DDBAAD28BE927B0009F000 /* FlowDemoApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowDemoApp.swift; sourceTree = "<group>"; };
F1DDBAAE28BE927B0009F000 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
F1DDBAAF28BE927D0009F000 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F1DDBAB428BE927D0009F000 /* FlowDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlowDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
F1DDBABA28BE927D0009F000 /* FlowDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlowDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
F1DDBABC28BE927D0009F000 /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = "<group>"; };
F1DDBACC28BE92A30009F000 /* Flow */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Flow; path = ..; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -36,14 +31,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
F1DDBAB728BE927D0009F000 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F1DDBAD128BE93100009F000 /* Flow in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -72,7 +59,6 @@
isa = PBXGroup;
children = (
F1DDBAB428BE927D0009F000 /* FlowDemo.app */,
F1DDBABA28BE927D0009F000 /* FlowDemo.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -103,9 +89,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
F1DDBAB328BE927D0009F000 /* FlowDemo (iOS) */ = {
F1DDBAB328BE927D0009F000 /* FlowDemo */ = {
isa = PBXNativeTarget;
buildConfigurationList = F1DDBAC528BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo (iOS)" */;
buildConfigurationList = F1DDBAC528BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo" */;
buildPhases = (
F1DDBAB028BE927D0009F000 /* Sources */,
F1DDBAB128BE927D0009F000 /* Frameworks */,
Expand All @@ -115,34 +101,14 @@
);
dependencies = (
);
name = "FlowDemo (iOS)";
name = FlowDemo;
packageProductDependencies = (
F1DDBACE28BE92D00009F000 /* Flow */,
);
productName = "FlowDemo (iOS)";
productReference = F1DDBAB428BE927D0009F000 /* FlowDemo.app */;
productType = "com.apple.product-type.application";
};
F1DDBAB928BE927D0009F000 /* FlowDemo (macOS) */ = {
isa = PBXNativeTarget;
buildConfigurationList = F1DDBAC828BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo (macOS)" */;
buildPhases = (
F1DDBAB628BE927D0009F000 /* Sources */,
F1DDBAB728BE927D0009F000 /* Frameworks */,
F1DDBAB828BE927D0009F000 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "FlowDemo (macOS)";
packageProductDependencies = (
F1DDBAD028BE93100009F000 /* Flow */,
);
productName = "FlowDemo (macOS)";
productReference = F1DDBABA28BE927D0009F000 /* FlowDemo.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -156,9 +122,6 @@
F1DDBAB328BE927D0009F000 = {
CreatedOnToolsVersion = 13.4.1;
};
F1DDBAB928BE927D0009F000 = {
CreatedOnToolsVersion = 13.4.1;
};
};
};
buildConfigurationList = F1DDBAAB28BE927B0009F000 /* Build configuration list for PBXProject "FlowDemo" */;
Expand All @@ -174,8 +137,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
F1DDBAB328BE927D0009F000 /* FlowDemo (iOS) */,
F1DDBAB928BE927D0009F000 /* FlowDemo (macOS) */,
F1DDBAB328BE927D0009F000 /* FlowDemo */,
);
};
/* End PBXProject section */
Expand All @@ -189,14 +151,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
F1DDBAB828BE927D0009F000 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F1DDBAC228BE927D0009F000 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -209,15 +163,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
F1DDBAB628BE927D0009F000 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F1DDBAC028BE927D0009F000 /* ContentView.swift in Sources */,
F1DDBABE28BE927D0009F000 /* FlowDemoApp.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -340,9 +285,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 9W69ZP8S5F;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
Expand All @@ -359,9 +305,13 @@
PRODUCT_NAME = FlowDemo;
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = "1,2,7";
};
name = Debug;
};
Expand All @@ -371,9 +321,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 9W69ZP8S5F;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
Expand All @@ -390,63 +341,17 @@
PRODUCT_NAME = FlowDemo;
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = "1,2,7";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
F1DDBAC928BE927D0009F000 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = io.audiokit.FlowDemo;
PRODUCT_NAME = FlowDemo;
SDKROOT = macosx;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
F1DDBACA28BE927D0009F000 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = io.audiokit.FlowDemo;
PRODUCT_NAME = FlowDemo;
SDKROOT = macosx;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand All @@ -459,7 +364,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F1DDBAC528BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo (iOS)" */ = {
F1DDBAC528BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo" */ = {
isa = XCConfigurationList;
buildConfigurations = (
F1DDBAC628BE927D0009F000 /* Debug */,
Expand All @@ -468,26 +373,13 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F1DDBAC828BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo (macOS)" */ = {
isa = XCConfigurationList;
buildConfigurations = (
F1DDBAC928BE927D0009F000 /* Debug */,
F1DDBACA28BE927D0009F000 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
F1DDBACE28BE92D00009F000 /* Flow */ = {
isa = XCSwiftPackageProductDependency;
productName = Flow;
};
F1DDBAD028BE93100009F000 /* Flow */ = {
isa = XCSwiftPackageProductDependency;
productName = Flow;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = F1DDBAA828BE927B0009F000 /* Project object */;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flow/Views/WorkspaceView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import SwiftUI
/// Provides pan and zoom gestures. Unfortunately it seems this
/// can't be accomplished using purely SwiftUI because MagnificationGesture
/// doesn't provide a center point.
#if os(iOS)
#if os(iOS) || os(visionOS)
struct WorkspaceView: UIViewRepresentable {
@Binding var pan: CGSize
@Binding var zoom: Double
Expand Down

0 comments on commit c2195af

Please sign in to comment.