Skip to content

Commit c2195af

Browse files
wthollidayaure
wtholliday
and
aure
committed
Compile for visionos
Remove separate macOS target Co-Authored-By: Aurelius Prochazka <aure@aure.com>
1 parent c490711 commit c2195af

File tree

2 files changed

+20
-128
lines changed

2 files changed

+20
-128
lines changed

‎Demo/FlowDemo.xcodeproj/project.pbxproj

+19-127
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,16 @@
88

99
/* Begin PBXBuildFile section */
1010
F1DDBABD28BE927D0009F000 /* FlowDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDBAAD28BE927B0009F000 /* FlowDemoApp.swift */; };
11-
F1DDBABE28BE927D0009F000 /* FlowDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDBAAD28BE927B0009F000 /* FlowDemoApp.swift */; };
1211
F1DDBABF28BE927D0009F000 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDBAAE28BE927B0009F000 /* ContentView.swift */; };
13-
F1DDBAC028BE927D0009F000 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDBAAE28BE927B0009F000 /* ContentView.swift */; };
1412
F1DDBAC128BE927D0009F000 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F1DDBAAF28BE927D0009F000 /* Assets.xcassets */; };
15-
F1DDBAC228BE927D0009F000 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F1DDBAAF28BE927D0009F000 /* Assets.xcassets */; };
1613
F1DDBACF28BE92D00009F000 /* Flow in Frameworks */ = {isa = PBXBuildFile; productRef = F1DDBACE28BE92D00009F000 /* Flow */; };
17-
F1DDBAD128BE93100009F000 /* Flow in Frameworks */ = {isa = PBXBuildFile; productRef = F1DDBAD028BE93100009F000 /* Flow */; };
1814
/* End PBXBuildFile section */
1915

2016
/* Begin PBXFileReference section */
2117
F1DDBAAD28BE927B0009F000 /* FlowDemoApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowDemoApp.swift; sourceTree = "<group>"; };
2218
F1DDBAAE28BE927B0009F000 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
2319
F1DDBAAF28BE927D0009F000 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2420
F1DDBAB428BE927D0009F000 /* FlowDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlowDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
25-
F1DDBABA28BE927D0009F000 /* FlowDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FlowDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
2621
F1DDBABC28BE927D0009F000 /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = "<group>"; };
2722
F1DDBACC28BE92A30009F000 /* Flow */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Flow; path = ..; sourceTree = "<group>"; };
2823
/* End PBXFileReference section */
@@ -36,14 +31,6 @@
3631
);
3732
runOnlyForDeploymentPostprocessing = 0;
3833
};
39-
F1DDBAB728BE927D0009F000 /* Frameworks */ = {
40-
isa = PBXFrameworksBuildPhase;
41-
buildActionMask = 2147483647;
42-
files = (
43-
F1DDBAD128BE93100009F000 /* Flow in Frameworks */,
44-
);
45-
runOnlyForDeploymentPostprocessing = 0;
46-
};
4734
/* End PBXFrameworksBuildPhase section */
4835

4936
/* Begin PBXGroup section */
@@ -72,7 +59,6 @@
7259
isa = PBXGroup;
7360
children = (
7461
F1DDBAB428BE927D0009F000 /* FlowDemo.app */,
75-
F1DDBABA28BE927D0009F000 /* FlowDemo.app */,
7662
);
7763
name = Products;
7864
sourceTree = "<group>";
@@ -103,9 +89,9 @@
10389
/* End PBXGroup section */
10490

10591
/* Begin PBXNativeTarget section */
106-
F1DDBAB328BE927D0009F000 /* FlowDemo (iOS) */ = {
92+
F1DDBAB328BE927D0009F000 /* FlowDemo */ = {
10793
isa = PBXNativeTarget;
108-
buildConfigurationList = F1DDBAC528BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo (iOS)" */;
94+
buildConfigurationList = F1DDBAC528BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo" */;
10995
buildPhases = (
11096
F1DDBAB028BE927D0009F000 /* Sources */,
11197
F1DDBAB128BE927D0009F000 /* Frameworks */,
@@ -115,34 +101,14 @@
115101
);
116102
dependencies = (
117103
);
118-
name = "FlowDemo (iOS)";
104+
name = FlowDemo;
119105
packageProductDependencies = (
120106
F1DDBACE28BE92D00009F000 /* Flow */,
121107
);
122108
productName = "FlowDemo (iOS)";
123109
productReference = F1DDBAB428BE927D0009F000 /* FlowDemo.app */;
124110
productType = "com.apple.product-type.application";
125111
};
126-
F1DDBAB928BE927D0009F000 /* FlowDemo (macOS) */ = {
127-
isa = PBXNativeTarget;
128-
buildConfigurationList = F1DDBAC828BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo (macOS)" */;
129-
buildPhases = (
130-
F1DDBAB628BE927D0009F000 /* Sources */,
131-
F1DDBAB728BE927D0009F000 /* Frameworks */,
132-
F1DDBAB828BE927D0009F000 /* Resources */,
133-
);
134-
buildRules = (
135-
);
136-
dependencies = (
137-
);
138-
name = "FlowDemo (macOS)";
139-
packageProductDependencies = (
140-
F1DDBAD028BE93100009F000 /* Flow */,
141-
);
142-
productName = "FlowDemo (macOS)";
143-
productReference = F1DDBABA28BE927D0009F000 /* FlowDemo.app */;
144-
productType = "com.apple.product-type.application";
145-
};
146112
/* End PBXNativeTarget section */
147113

148114
/* Begin PBXProject section */
@@ -156,9 +122,6 @@
156122
F1DDBAB328BE927D0009F000 = {
157123
CreatedOnToolsVersion = 13.4.1;
158124
};
159-
F1DDBAB928BE927D0009F000 = {
160-
CreatedOnToolsVersion = 13.4.1;
161-
};
162125
};
163126
};
164127
buildConfigurationList = F1DDBAAB28BE927B0009F000 /* Build configuration list for PBXProject "FlowDemo" */;
@@ -174,8 +137,7 @@
174137
projectDirPath = "";
175138
projectRoot = "";
176139
targets = (
177-
F1DDBAB328BE927D0009F000 /* FlowDemo (iOS) */,
178-
F1DDBAB928BE927D0009F000 /* FlowDemo (macOS) */,
140+
F1DDBAB328BE927D0009F000 /* FlowDemo */,
179141
);
180142
};
181143
/* End PBXProject section */
@@ -189,14 +151,6 @@
189151
);
190152
runOnlyForDeploymentPostprocessing = 0;
191153
};
192-
F1DDBAB828BE927D0009F000 /* Resources */ = {
193-
isa = PBXResourcesBuildPhase;
194-
buildActionMask = 2147483647;
195-
files = (
196-
F1DDBAC228BE927D0009F000 /* Assets.xcassets in Resources */,
197-
);
198-
runOnlyForDeploymentPostprocessing = 0;
199-
};
200154
/* End PBXResourcesBuildPhase section */
201155

202156
/* Begin PBXSourcesBuildPhase section */
@@ -209,15 +163,6 @@
209163
);
210164
runOnlyForDeploymentPostprocessing = 0;
211165
};
212-
F1DDBAB628BE927D0009F000 /* Sources */ = {
213-
isa = PBXSourcesBuildPhase;
214-
buildActionMask = 2147483647;
215-
files = (
216-
F1DDBAC028BE927D0009F000 /* ContentView.swift in Sources */,
217-
F1DDBABE28BE927D0009F000 /* FlowDemoApp.swift in Sources */,
218-
);
219-
runOnlyForDeploymentPostprocessing = 0;
220-
};
221166
/* End PBXSourcesBuildPhase section */
222167

223168
/* Begin XCBuildConfiguration section */
@@ -340,9 +285,10 @@
340285
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
341286
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
342287
CODE_SIGN_IDENTITY = "Apple Development";
288+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
343289
CODE_SIGN_STYLE = Automatic;
344290
CURRENT_PROJECT_VERSION = 1;
345-
DEVELOPMENT_TEAM = "";
291+
DEVELOPMENT_TEAM = 9W69ZP8S5F;
346292
ENABLE_PREVIEWS = YES;
347293
GENERATE_INFOPLIST_FILE = YES;
348294
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
@@ -359,9 +305,13 @@
359305
PRODUCT_NAME = FlowDemo;
360306
PROVISIONING_PROFILE_SPECIFIER = "";
361307
SDKROOT = iphoneos;
308+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
309+
SUPPORTS_MACCATALYST = NO;
310+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
311+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
362312
SWIFT_EMIT_LOC_STRINGS = YES;
363313
SWIFT_VERSION = 5.0;
364-
TARGETED_DEVICE_FAMILY = "1,2";
314+
TARGETED_DEVICE_FAMILY = "1,2,7";
365315
};
366316
name = Debug;
367317
};
@@ -371,9 +321,10 @@
371321
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
372322
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
373323
CODE_SIGN_IDENTITY = "Apple Development";
324+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
374325
CODE_SIGN_STYLE = Automatic;
375326
CURRENT_PROJECT_VERSION = 1;
376-
DEVELOPMENT_TEAM = "";
327+
DEVELOPMENT_TEAM = 9W69ZP8S5F;
377328
ENABLE_PREVIEWS = YES;
378329
GENERATE_INFOPLIST_FILE = YES;
379330
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
@@ -390,63 +341,17 @@
390341
PRODUCT_NAME = FlowDemo;
391342
PROVISIONING_PROFILE_SPECIFIER = "";
392343
SDKROOT = iphoneos;
344+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
345+
SUPPORTS_MACCATALYST = NO;
346+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
347+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
393348
SWIFT_EMIT_LOC_STRINGS = YES;
394349
SWIFT_VERSION = 5.0;
395-
TARGETED_DEVICE_FAMILY = "1,2";
350+
TARGETED_DEVICE_FAMILY = "1,2,7";
396351
VALIDATE_PRODUCT = YES;
397352
};
398353
name = Release;
399354
};
400-
F1DDBAC928BE927D0009F000 /* Debug */ = {
401-
isa = XCBuildConfiguration;
402-
buildSettings = {
403-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
404-
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
405-
CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements;
406-
CODE_SIGN_STYLE = Automatic;
407-
COMBINE_HIDPI_IMAGES = YES;
408-
CURRENT_PROJECT_VERSION = 1;
409-
ENABLE_PREVIEWS = YES;
410-
GENERATE_INFOPLIST_FILE = YES;
411-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
412-
LD_RUNPATH_SEARCH_PATHS = (
413-
"$(inherited)",
414-
"@executable_path/../Frameworks",
415-
);
416-
MARKETING_VERSION = 1.0;
417-
PRODUCT_BUNDLE_IDENTIFIER = io.audiokit.FlowDemo;
418-
PRODUCT_NAME = FlowDemo;
419-
SDKROOT = macosx;
420-
SWIFT_EMIT_LOC_STRINGS = YES;
421-
SWIFT_VERSION = 5.0;
422-
};
423-
name = Debug;
424-
};
425-
F1DDBACA28BE927D0009F000 /* Release */ = {
426-
isa = XCBuildConfiguration;
427-
buildSettings = {
428-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
429-
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
430-
CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements;
431-
CODE_SIGN_STYLE = Automatic;
432-
COMBINE_HIDPI_IMAGES = YES;
433-
CURRENT_PROJECT_VERSION = 1;
434-
ENABLE_PREVIEWS = YES;
435-
GENERATE_INFOPLIST_FILE = YES;
436-
INFOPLIST_KEY_NSHumanReadableCopyright = "";
437-
LD_RUNPATH_SEARCH_PATHS = (
438-
"$(inherited)",
439-
"@executable_path/../Frameworks",
440-
);
441-
MARKETING_VERSION = 1.0;
442-
PRODUCT_BUNDLE_IDENTIFIER = io.audiokit.FlowDemo;
443-
PRODUCT_NAME = FlowDemo;
444-
SDKROOT = macosx;
445-
SWIFT_EMIT_LOC_STRINGS = YES;
446-
SWIFT_VERSION = 5.0;
447-
};
448-
name = Release;
449-
};
450355
/* End XCBuildConfiguration section */
451356

452357
/* Begin XCConfigurationList section */
@@ -459,7 +364,7 @@
459364
defaultConfigurationIsVisible = 0;
460365
defaultConfigurationName = Release;
461366
};
462-
F1DDBAC528BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo (iOS)" */ = {
367+
F1DDBAC528BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo" */ = {
463368
isa = XCConfigurationList;
464369
buildConfigurations = (
465370
F1DDBAC628BE927D0009F000 /* Debug */,
@@ -468,26 +373,13 @@
468373
defaultConfigurationIsVisible = 0;
469374
defaultConfigurationName = Release;
470375
};
471-
F1DDBAC828BE927D0009F000 /* Build configuration list for PBXNativeTarget "FlowDemo (macOS)" */ = {
472-
isa = XCConfigurationList;
473-
buildConfigurations = (
474-
F1DDBAC928BE927D0009F000 /* Debug */,
475-
F1DDBACA28BE927D0009F000 /* Release */,
476-
);
477-
defaultConfigurationIsVisible = 0;
478-
defaultConfigurationName = Release;
479-
};
480376
/* End XCConfigurationList section */
481377

482378
/* Begin XCSwiftPackageProductDependency section */
483379
F1DDBACE28BE92D00009F000 /* Flow */ = {
484380
isa = XCSwiftPackageProductDependency;
485381
productName = Flow;
486382
};
487-
F1DDBAD028BE93100009F000 /* Flow */ = {
488-
isa = XCSwiftPackageProductDependency;
489-
productName = Flow;
490-
};
491383
/* End XCSwiftPackageProductDependency section */
492384
};
493385
rootObject = F1DDBAA828BE927B0009F000 /* Project object */;

‎Sources/Flow/Views/WorkspaceView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import SwiftUI
55
/// Provides pan and zoom gestures. Unfortunately it seems this
66
/// can't be accomplished using purely SwiftUI because MagnificationGesture
77
/// doesn't provide a center point.
8-
#if os(iOS)
8+
#if os(iOS) || os(visionOS)
99
struct WorkspaceView: UIViewRepresentable {
1010
@Binding var pan: CGSize
1111
@Binding var zoom: Double

0 commit comments

Comments
 (0)