From cbe4e57c8ac0b6c03d66cde42f5f6e0bb7b3606e Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 4 Jun 2024 13:40:32 -0500 Subject: [PATCH 1/3] Fix Bindable availability. --- .github/workflows/ci.yml | 2 + Example/CompatibilityTests/App.swift | 8 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 63 ++++ .../Assets.xcassets/Contents.json | 6 + .../CompatibilityTests/Compatability.swift | 10 + .../CompatibilityTests.entitlements | 10 + .../Preview Assets.xcassets/Contents.json | 6 + Example/Example.xcodeproj/project.pbxproj | 272 +++++++----------- .../xcshareddata/swiftpm/Package.resolved | 9 - .../xcshareddata/xcschemes/Example.xcscheme | 11 + Example/ExampleTests/ExampleTests.swift | 6 - Example/ExampleUITests/ExampleUITests.swift | 4 - Makefile | 14 + Sources/Perception/Bindable.swift | 4 + .../PerceptionTrackingTests.swift | 1 + 16 files changed, 249 insertions(+), 188 deletions(-) create mode 100644 Example/CompatibilityTests/App.swift create mode 100644 Example/CompatibilityTests/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 Example/CompatibilityTests/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 Example/CompatibilityTests/Assets.xcassets/Contents.json create mode 100644 Example/CompatibilityTests/Compatability.swift create mode 100644 Example/CompatibilityTests/CompatibilityTests.entitlements create mode 100644 Example/CompatibilityTests/Preview Content/Preview Assets.xcassets/Contents.json delete mode 100644 Example/ExampleTests/ExampleTests.swift delete mode 100644 Example/ExampleUITests/ExampleUITests.swift diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f791862..c7ba8ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,3 +27,5 @@ jobs: run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - name: Run ${{ matrix.config }} tests run: swift test -c ${{ matrix.config }} + - name: Run ${{ matrix.config }} compatibility tests + run: CONFIG=${{ matrix.config }} make test-compatibility diff --git a/Example/CompatibilityTests/App.swift b/Example/CompatibilityTests/App.swift new file mode 100644 index 0000000..481920c --- /dev/null +++ b/Example/CompatibilityTests/App.swift @@ -0,0 +1,8 @@ +import SwiftUI +@main +struct CompatibilityTestsApp: App { + var body: some Scene { + WindowGroup { + } + } +} diff --git a/Example/CompatibilityTests/Assets.xcassets/AccentColor.colorset/Contents.json b/Example/CompatibilityTests/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..eb87897 --- /dev/null +++ b/Example/CompatibilityTests/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Example/CompatibilityTests/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/CompatibilityTests/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..532cd72 --- /dev/null +++ b/Example/CompatibilityTests/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,63 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Example/CompatibilityTests/Assets.xcassets/Contents.json b/Example/CompatibilityTests/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Example/CompatibilityTests/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Example/CompatibilityTests/Compatability.swift b/Example/CompatibilityTests/Compatability.swift new file mode 100644 index 0000000..2df1f03 --- /dev/null +++ b/Example/CompatibilityTests/Compatability.swift @@ -0,0 +1,10 @@ +import SwiftUI +import Perception + +@Observable +class Model { +} + +struct Foo { + @Bindable var model = Model() +} diff --git a/Example/CompatibilityTests/CompatibilityTests.entitlements b/Example/CompatibilityTests/CompatibilityTests.entitlements new file mode 100644 index 0000000..f2ef3ae --- /dev/null +++ b/Example/CompatibilityTests/CompatibilityTests.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-only + + + diff --git a/Example/CompatibilityTests/Preview Content/Preview Assets.xcassets/Contents.json b/Example/CompatibilityTests/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Example/CompatibilityTests/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 393b240..1d71486 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -10,39 +10,27 @@ CA114E912AE1FC29004844BE /* ExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA114E902AE1FC29004844BE /* ExampleApp.swift */; }; CA114E932AE1FC29004844BE /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA114E922AE1FC29004844BE /* ContentView.swift */; }; CA114E952AE1FC2A004844BE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CA114E942AE1FC2A004844BE /* Assets.xcassets */; }; - CA114EA22AE1FC2A004844BE /* ExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA114EA12AE1FC2A004844BE /* ExampleTests.swift */; }; - CA114EAC2AE1FC2A004844BE /* ExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA114EAB2AE1FC2A004844BE /* ExampleUITests.swift */; }; CA114EBE2AE1FCD7004844BE /* Perception in Frameworks */ = {isa = PBXBuildFile; productRef = CA114EBD2AE1FCD7004844BE /* Perception */; }; + CAA8084F2C0F9496000DE5B7 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA8084E2C0F9496000DE5B7 /* App.swift */; }; + CAA808512C0F9496000DE5B7 /* Compatability.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA808502C0F9496000DE5B7 /* Compatability.swift */; }; + CAA808532C0F9498000DE5B7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CAA808522C0F9498000DE5B7 /* Assets.xcassets */; }; + CAA808572C0F9498000DE5B7 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CAA808562C0F9498000DE5B7 /* Preview Assets.xcassets */; }; + CAD688CF2C0F961B0035575C /* Perception in Frameworks */ = {isa = PBXBuildFile; productRef = CAD688CE2C0F961B0035575C /* Perception */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - CA114E9E2AE1FC2A004844BE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = CA114E852AE1FC28004844BE /* Project object */; - proxyType = 1; - remoteGlobalIDString = CA114E8C2AE1FC29004844BE; - remoteInfo = Example; - }; - CA114EA82AE1FC2A004844BE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = CA114E852AE1FC28004844BE /* Project object */; - proxyType = 1; - remoteGlobalIDString = CA114E8C2AE1FC29004844BE; - remoteInfo = Example; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ CA114E8D2AE1FC29004844BE /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; CA114E902AE1FC29004844BE /* ExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleApp.swift; sourceTree = ""; }; CA114E922AE1FC29004844BE /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; CA114E942AE1FC2A004844BE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - CA114E9D2AE1FC2A004844BE /* ExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - CA114EA12AE1FC2A004844BE /* ExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleTests.swift; sourceTree = ""; }; - CA114EA72AE1FC2A004844BE /* ExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - CA114EAB2AE1FC2A004844BE /* ExampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleUITests.swift; sourceTree = ""; }; CA114EBA2AE1FC71004844BE /* swift-perception */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "swift-perception"; path = ..; sourceTree = ""; }; CA114EBB2AE1FCCE004844BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + CAA8084C2C0F9496000DE5B7 /* CompatibilityTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CompatibilityTests.app; sourceTree = BUILT_PRODUCTS_DIR; }; + CAA8084E2C0F9496000DE5B7 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = ""; }; + CAA808502C0F9496000DE5B7 /* Compatability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Compatability.swift; sourceTree = ""; }; + CAA808522C0F9498000DE5B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + CAA808542C0F9498000DE5B7 /* CompatibilityTests.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CompatibilityTests.entitlements; sourceTree = ""; }; + CAA808562C0F9498000DE5B7 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,17 +42,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CA114E9A2AE1FC2A004844BE /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - CA114EA42AE1FC2A004844BE /* Frameworks */ = { + CAA808492C0F9496000DE5B7 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CAD688CF2C0F961B0035575C /* Perception in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,8 +58,7 @@ children = ( CA114EBA2AE1FC71004844BE /* swift-perception */, CA114E8F2AE1FC29004844BE /* Example */, - CA114EA02AE1FC2A004844BE /* ExampleTests */, - CA114EAA2AE1FC2A004844BE /* ExampleUITests */, + CAA8084D2C0F9496000DE5B7 /* CompatibilityTests */, CA114E8E2AE1FC29004844BE /* Products */, CA114EBC2AE1FCD7004844BE /* Frameworks */, ); @@ -87,8 +68,7 @@ isa = PBXGroup; children = ( CA114E8D2AE1FC29004844BE /* Example.app */, - CA114E9D2AE1FC2A004844BE /* ExampleTests.xctest */, - CA114EA72AE1FC2A004844BE /* ExampleUITests.xctest */, + CAA8084C2C0F9496000DE5B7 /* CompatibilityTests.app */, ); name = Products; sourceTree = ""; @@ -104,27 +84,31 @@ path = Example; sourceTree = ""; }; - CA114EA02AE1FC2A004844BE /* ExampleTests */ = { + CA114EBC2AE1FCD7004844BE /* Frameworks */ = { isa = PBXGroup; children = ( - CA114EA12AE1FC2A004844BE /* ExampleTests.swift */, ); - path = ExampleTests; + name = Frameworks; sourceTree = ""; }; - CA114EAA2AE1FC2A004844BE /* ExampleUITests */ = { + CAA8084D2C0F9496000DE5B7 /* CompatibilityTests */ = { isa = PBXGroup; children = ( - CA114EAB2AE1FC2A004844BE /* ExampleUITests.swift */, + CAA8084E2C0F9496000DE5B7 /* App.swift */, + CAA808502C0F9496000DE5B7 /* Compatability.swift */, + CAA808522C0F9498000DE5B7 /* Assets.xcassets */, + CAA808542C0F9498000DE5B7 /* CompatibilityTests.entitlements */, + CAA808552C0F9498000DE5B7 /* Preview Content */, ); - path = ExampleUITests; + path = CompatibilityTests; sourceTree = ""; }; - CA114EBC2AE1FCD7004844BE /* Frameworks */ = { + CAA808552C0F9498000DE5B7 /* Preview Content */ = { isa = PBXGroup; children = ( + CAA808562C0F9498000DE5B7 /* Preview Assets.xcassets */, ); - name = Frameworks; + path = "Preview Content"; sourceTree = ""; }; /* End PBXGroup section */ @@ -150,41 +134,25 @@ productReference = CA114E8D2AE1FC29004844BE /* Example.app */; productType = "com.apple.product-type.application"; }; - CA114E9C2AE1FC2A004844BE /* ExampleTests */ = { + CAA8084B2C0F9496000DE5B7 /* CompatibilityTests */ = { isa = PBXNativeTarget; - buildConfigurationList = CA114EB42AE1FC2A004844BE /* Build configuration list for PBXNativeTarget "ExampleTests" */; + buildConfigurationList = CAA808582C0F9498000DE5B7 /* Build configuration list for PBXNativeTarget "CompatibilityTests" */; buildPhases = ( - CA114E992AE1FC2A004844BE /* Sources */, - CA114E9A2AE1FC2A004844BE /* Frameworks */, - CA114E9B2AE1FC2A004844BE /* Resources */, + CAA808482C0F9496000DE5B7 /* Sources */, + CAA808492C0F9496000DE5B7 /* Frameworks */, + CAA8084A2C0F9496000DE5B7 /* Resources */, ); buildRules = ( ); dependencies = ( - CA114E9F2AE1FC2A004844BE /* PBXTargetDependency */, - ); - name = ExampleTests; - productName = ExampleTests; - productReference = CA114E9D2AE1FC2A004844BE /* ExampleTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - CA114EA62AE1FC2A004844BE /* ExampleUITests */ = { - isa = PBXNativeTarget; - buildConfigurationList = CA114EB72AE1FC2A004844BE /* Build configuration list for PBXNativeTarget "ExampleUITests" */; - buildPhases = ( - CA114EA32AE1FC2A004844BE /* Sources */, - CA114EA42AE1FC2A004844BE /* Frameworks */, - CA114EA52AE1FC2A004844BE /* Resources */, ); - buildRules = ( - ); - dependencies = ( - CA114EA92AE1FC2A004844BE /* PBXTargetDependency */, + name = CompatibilityTests; + packageProductDependencies = ( + CAD688CE2C0F961B0035575C /* Perception */, ); - name = ExampleUITests; - productName = ExampleUITests; - productReference = CA114EA72AE1FC2A004844BE /* ExampleUITests.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; + productName = CompatibilityTests; + productReference = CAA8084C2C0F9496000DE5B7 /* CompatibilityTests.app */; + productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -193,19 +161,14 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = 1; - LastSwiftUpdateCheck = 1500; + LastSwiftUpdateCheck = 1540; LastUpgradeCheck = 1500; TargetAttributes = { CA114E8C2AE1FC29004844BE = { CreatedOnToolsVersion = 15.0; }; - CA114E9C2AE1FC2A004844BE = { - CreatedOnToolsVersion = 15.0; - TestTargetID = CA114E8C2AE1FC29004844BE; - }; - CA114EA62AE1FC2A004844BE = { - CreatedOnToolsVersion = 15.0; - TestTargetID = CA114E8C2AE1FC29004844BE; + CAA8084B2C0F9496000DE5B7 = { + CreatedOnToolsVersion = 15.4; }; }; }; @@ -223,8 +186,7 @@ projectRoot = ""; targets = ( CA114E8C2AE1FC29004844BE /* Example */, - CA114E9C2AE1FC2A004844BE /* ExampleTests */, - CA114EA62AE1FC2A004844BE /* ExampleUITests */, + CAA8084B2C0F9496000DE5B7 /* CompatibilityTests */, ); }; /* End PBXProject section */ @@ -238,17 +200,12 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CA114E9B2AE1FC2A004844BE /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - CA114EA52AE1FC2A004844BE /* Resources */ = { + CAA8084A2C0F9496000DE5B7 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + CAA808572C0F9498000DE5B7 /* Preview Assets.xcassets in Resources */, + CAA808532C0F9498000DE5B7 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -264,37 +221,17 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CA114E992AE1FC2A004844BE /* Sources */ = { + CAA808482C0F9496000DE5B7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - CA114EA22AE1FC2A004844BE /* ExampleTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - CA114EA32AE1FC2A004844BE /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - CA114EAC2AE1FC2A004844BE /* ExampleUITests.swift in Sources */, + CAA808512C0F9496000DE5B7 /* Compatability.swift in Sources */, + CAA8084F2C0F9496000DE5B7 /* App.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - CA114E9F2AE1FC2A004844BE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = CA114E8C2AE1FC29004844BE /* Example */; - targetProxy = CA114E9E2AE1FC2A004844BE /* PBXContainerItemProxy */; - }; - CA114EA92AE1FC2A004844BE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = CA114E8C2AE1FC29004844BE /* Example */; - targetProxy = CA114EA82AE1FC2A004844BE /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ CA114EAF2AE1FC2A004844BE /* Debug */ = { isa = XCBuildConfiguration; @@ -473,73 +410,75 @@ }; name = Release; }; - CA114EB52AE1FC2A004844BE /* Debug */ = { + CAA808592C0F9498000DE5B7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.ExampleTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Example"; - }; - name = Debug; - }; - CA114EB62AE1FC2A004844BE /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.ExampleTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Example"; - }; - name = Release; - }; - CA114EB82AE1FC2A004844BE /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = CompatibilityTests/CompatibilityTests.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = "\"CompatibilityTests/Preview Content\""; + ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.ExampleUITests; + PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CompatibilityTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; + SDKROOT = auto; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = Example; }; name = Debug; }; - CA114EB92AE1FC2A004844BE /* Release */ = { + CAA8085A2C0F9498000DE5B7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = CompatibilityTests/CompatibilityTests.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = "\"CompatibilityTests/Preview Content\""; + ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; + "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; + "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.ExampleUITests; + PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CompatibilityTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; + SDKROOT = auto; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = Example; }; name = Release; }; @@ -564,20 +503,11 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - CA114EB42AE1FC2A004844BE /* Build configuration list for PBXNativeTarget "ExampleTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CA114EB52AE1FC2A004844BE /* Debug */, - CA114EB62AE1FC2A004844BE /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - CA114EB72AE1FC2A004844BE /* Build configuration list for PBXNativeTarget "ExampleUITests" */ = { + CAA808582C0F9498000DE5B7 /* Build configuration list for PBXNativeTarget "CompatibilityTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - CA114EB82AE1FC2A004844BE /* Debug */, - CA114EB92AE1FC2A004844BE /* Release */, + CAA808592C0F9498000DE5B7 /* Debug */, + CAA8085A2C0F9498000DE5B7 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -589,6 +519,10 @@ isa = XCSwiftPackageProductDependency; productName = Perception; }; + CAD688CE2C0F961B0035575C /* Perception */ = { + isa = XCSwiftPackageProductDependency; + productName = Perception; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = CA114E852AE1FC28004844BE /* Project object */; diff --git a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 2d1368f..3f11750 100644 --- a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,14 +1,5 @@ { "pins" : [ - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections", - "state" : { - "revision" : "d029d9d39c87bed85b1c50adee7c41795261a192", - "version" : "1.0.6" - } - }, { "identity" : "swift-macro-testing", "kind" : "remoteSourceControl", diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme index 52bde63..a7fc0da 100644 --- a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme +++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme @@ -51,6 +51,17 @@ ReferencedContainer = "container:Example.xcodeproj"> + + + + Date: Tue, 4 Jun 2024 13:41:45 -0500 Subject: [PATCH 2/3] wip --- Example/CompatibilityTests/App.swift | 8 - .../AccentColor.colorset/Contents.json | 11 -- .../AppIcon.appiconset/Contents.json | 63 ------- .../Assets.xcassets/Contents.json | 6 - .../CompatibilityTests/Compatability.swift | 10 -- .../CompatibilityTests.entitlements | 10 -- .../Preview Assets.xcassets/Contents.json | 6 - Example/Example.xcodeproj/project.pbxproj | 168 ------------------ 8 files changed, 282 deletions(-) delete mode 100644 Example/CompatibilityTests/App.swift delete mode 100644 Example/CompatibilityTests/Assets.xcassets/AccentColor.colorset/Contents.json delete mode 100644 Example/CompatibilityTests/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 Example/CompatibilityTests/Assets.xcassets/Contents.json delete mode 100644 Example/CompatibilityTests/Compatability.swift delete mode 100644 Example/CompatibilityTests/CompatibilityTests.entitlements delete mode 100644 Example/CompatibilityTests/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/Example/CompatibilityTests/App.swift b/Example/CompatibilityTests/App.swift deleted file mode 100644 index 481920c..0000000 --- a/Example/CompatibilityTests/App.swift +++ /dev/null @@ -1,8 +0,0 @@ -import SwiftUI -@main -struct CompatibilityTestsApp: App { - var body: some Scene { - WindowGroup { - } - } -} diff --git a/Example/CompatibilityTests/Assets.xcassets/AccentColor.colorset/Contents.json b/Example/CompatibilityTests/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb87897..0000000 --- a/Example/CompatibilityTests/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example/CompatibilityTests/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/CompatibilityTests/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 532cd72..0000000 --- a/Example/CompatibilityTests/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example/CompatibilityTests/Assets.xcassets/Contents.json b/Example/CompatibilityTests/Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/Example/CompatibilityTests/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example/CompatibilityTests/Compatability.swift b/Example/CompatibilityTests/Compatability.swift deleted file mode 100644 index 2df1f03..0000000 --- a/Example/CompatibilityTests/Compatability.swift +++ /dev/null @@ -1,10 +0,0 @@ -import SwiftUI -import Perception - -@Observable -class Model { -} - -struct Foo { - @Bindable var model = Model() -} diff --git a/Example/CompatibilityTests/CompatibilityTests.entitlements b/Example/CompatibilityTests/CompatibilityTests.entitlements deleted file mode 100644 index f2ef3ae..0000000 --- a/Example/CompatibilityTests/CompatibilityTests.entitlements +++ /dev/null @@ -1,10 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.files.user-selected.read-only - - - diff --git a/Example/CompatibilityTests/Preview Content/Preview Assets.xcassets/Contents.json b/Example/CompatibilityTests/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/Example/CompatibilityTests/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 1d71486..2635566 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -11,11 +11,6 @@ CA114E932AE1FC29004844BE /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA114E922AE1FC29004844BE /* ContentView.swift */; }; CA114E952AE1FC2A004844BE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CA114E942AE1FC2A004844BE /* Assets.xcassets */; }; CA114EBE2AE1FCD7004844BE /* Perception in Frameworks */ = {isa = PBXBuildFile; productRef = CA114EBD2AE1FCD7004844BE /* Perception */; }; - CAA8084F2C0F9496000DE5B7 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA8084E2C0F9496000DE5B7 /* App.swift */; }; - CAA808512C0F9496000DE5B7 /* Compatability.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA808502C0F9496000DE5B7 /* Compatability.swift */; }; - CAA808532C0F9498000DE5B7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CAA808522C0F9498000DE5B7 /* Assets.xcassets */; }; - CAA808572C0F9498000DE5B7 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CAA808562C0F9498000DE5B7 /* Preview Assets.xcassets */; }; - CAD688CF2C0F961B0035575C /* Perception in Frameworks */ = {isa = PBXBuildFile; productRef = CAD688CE2C0F961B0035575C /* Perception */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -25,12 +20,6 @@ CA114E942AE1FC2A004844BE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; CA114EBA2AE1FC71004844BE /* swift-perception */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "swift-perception"; path = ..; sourceTree = ""; }; CA114EBB2AE1FCCE004844BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - CAA8084C2C0F9496000DE5B7 /* CompatibilityTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CompatibilityTests.app; sourceTree = BUILT_PRODUCTS_DIR; }; - CAA8084E2C0F9496000DE5B7 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = ""; }; - CAA808502C0F9496000DE5B7 /* Compatability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Compatability.swift; sourceTree = ""; }; - CAA808522C0F9498000DE5B7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - CAA808542C0F9498000DE5B7 /* CompatibilityTests.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CompatibilityTests.entitlements; sourceTree = ""; }; - CAA808562C0F9498000DE5B7 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -42,14 +31,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CAA808492C0F9496000DE5B7 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - CAD688CF2C0F961B0035575C /* Perception in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -58,7 +39,6 @@ children = ( CA114EBA2AE1FC71004844BE /* swift-perception */, CA114E8F2AE1FC29004844BE /* Example */, - CAA8084D2C0F9496000DE5B7 /* CompatibilityTests */, CA114E8E2AE1FC29004844BE /* Products */, CA114EBC2AE1FCD7004844BE /* Frameworks */, ); @@ -68,7 +48,6 @@ isa = PBXGroup; children = ( CA114E8D2AE1FC29004844BE /* Example.app */, - CAA8084C2C0F9496000DE5B7 /* CompatibilityTests.app */, ); name = Products; sourceTree = ""; @@ -91,26 +70,6 @@ name = Frameworks; sourceTree = ""; }; - CAA8084D2C0F9496000DE5B7 /* CompatibilityTests */ = { - isa = PBXGroup; - children = ( - CAA8084E2C0F9496000DE5B7 /* App.swift */, - CAA808502C0F9496000DE5B7 /* Compatability.swift */, - CAA808522C0F9498000DE5B7 /* Assets.xcassets */, - CAA808542C0F9498000DE5B7 /* CompatibilityTests.entitlements */, - CAA808552C0F9498000DE5B7 /* Preview Content */, - ); - path = CompatibilityTests; - sourceTree = ""; - }; - CAA808552C0F9498000DE5B7 /* Preview Content */ = { - isa = PBXGroup; - children = ( - CAA808562C0F9498000DE5B7 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -134,26 +93,6 @@ productReference = CA114E8D2AE1FC29004844BE /* Example.app */; productType = "com.apple.product-type.application"; }; - CAA8084B2C0F9496000DE5B7 /* CompatibilityTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = CAA808582C0F9498000DE5B7 /* Build configuration list for PBXNativeTarget "CompatibilityTests" */; - buildPhases = ( - CAA808482C0F9496000DE5B7 /* Sources */, - CAA808492C0F9496000DE5B7 /* Frameworks */, - CAA8084A2C0F9496000DE5B7 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = CompatibilityTests; - packageProductDependencies = ( - CAD688CE2C0F961B0035575C /* Perception */, - ); - productName = CompatibilityTests; - productReference = CAA8084C2C0F9496000DE5B7 /* CompatibilityTests.app */; - productType = "com.apple.product-type.application"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -167,9 +106,6 @@ CA114E8C2AE1FC29004844BE = { CreatedOnToolsVersion = 15.0; }; - CAA8084B2C0F9496000DE5B7 = { - CreatedOnToolsVersion = 15.4; - }; }; }; buildConfigurationList = CA114E882AE1FC29004844BE /* Build configuration list for PBXProject "Example" */; @@ -186,7 +122,6 @@ projectRoot = ""; targets = ( CA114E8C2AE1FC29004844BE /* Example */, - CAA8084B2C0F9496000DE5B7 /* CompatibilityTests */, ); }; /* End PBXProject section */ @@ -200,15 +135,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CAA8084A2C0F9496000DE5B7 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - CAA808572C0F9498000DE5B7 /* Preview Assets.xcassets in Resources */, - CAA808532C0F9498000DE5B7 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -221,15 +147,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CAA808482C0F9496000DE5B7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - CAA808512C0F9496000DE5B7 /* Compatability.swift in Sources */, - CAA8084F2C0F9496000DE5B7 /* App.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -410,78 +327,6 @@ }; name = Release; }; - CAA808592C0F9498000DE5B7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = CompatibilityTests/CompatibilityTests.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"CompatibilityTests/Preview Content\""; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CompatibilityTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - CAA8085A2C0F9498000DE5B7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = CompatibilityTests/CompatibilityTests.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"CompatibilityTests/Preview Content\""; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CompatibilityTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -503,15 +348,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - CAA808582C0F9498000DE5B7 /* Build configuration list for PBXNativeTarget "CompatibilityTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CAA808592C0F9498000DE5B7 /* Debug */, - CAA8085A2C0F9498000DE5B7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ @@ -519,10 +355,6 @@ isa = XCSwiftPackageProductDependency; productName = Perception; }; - CAD688CE2C0F961B0035575C /* Perception */ = { - isa = XCSwiftPackageProductDependency; - productName = Perception; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = CA114E852AE1FC28004844BE /* Project object */; From 62cde3c7f712b5e42186d53889a98b7866d326be Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 4 Jun 2024 13:43:18 -0500 Subject: [PATCH 3/3] wip --- .github/workflows/ci.yml | 2 -- Makefile | 14 -------------- .../PerceptionTests/PerceptionTrackingTests.swift | 1 - 3 files changed, 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7ba8ee..f791862 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,5 +27,3 @@ jobs: run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - name: Run ${{ matrix.config }} tests run: swift test -c ${{ matrix.config }} - - name: Run ${{ matrix.config }} compatibility tests - run: CONFIG=${{ matrix.config }} make test-compatibility diff --git a/Makefile b/Makefile index b85ff14..2ee63a1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,3 @@ -CONFIG = debug -PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17.2,iPhone \d\+ Pro [^M]) - format: find . \ -path '*/Documentation.docc' -prune -o \ @@ -8,16 +5,5 @@ format: -not -path '*/.*' -print0 \ | xargs -0 swift format --ignore-unparsable-files --in-place -test-compatibility: - xcodebuild \ - -skipMacroValidation \ - -configuration $(CONFIG) \ - -scheme CompatibilityTests \ - -project Example/Example.xcodeproj \ - -destination generic/platform="$PLATFORM_IOS" || exit 1; - .PHONY: format -define udid_for -$(shell xcrun simctl list devices available '$(1)' | grep '$(2)' | sort -r | head -1 | awk -F '[()]' '{ print $$(NF-3) }') -endef diff --git a/Tests/PerceptionTests/PerceptionTrackingTests.swift b/Tests/PerceptionTests/PerceptionTrackingTests.swift index 5a8e656..7bdf12b 100644 --- a/Tests/PerceptionTests/PerceptionTrackingTests.swift +++ b/Tests/PerceptionTests/PerceptionTrackingTests.swift @@ -1,5 +1,4 @@ import Perception -import SwiftUI import XCTest final class PerceptionTrackingTests: XCTestCase {