Skip to content

Commit

Permalink
Update Xcode schemes and minimum OS targets.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mluisbrown
mluisbrown committed Mar 19, 2024
1 parent 858d248 commit 715c339
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 27 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ jobs:
SCHEME=ReactiveSwift-tvOS
;;
"watchOS")
ACTION=build
DESTINATION="platform=watchOS Simulator,name=Apple Watch Series 5 (44mm)"
SCHEME=ReactiveSwift-watchOS
;;
Expand Down
36 changes: 32 additions & 4 deletions ReactiveSwift.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,7 @@
"DTRACE_PROBES_DISABLED=1",
);
INFOPLIST_FILE = Sources/Info.plist;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -1506,6 +1507,7 @@
"DTRACE_PROBES_DISABLED=1",
);
INFOPLIST_FILE = Sources/Info.plist;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Test;
};
Expand All @@ -1520,6 +1522,7 @@
"DTRACE_PROBES_DISABLED=1",
);
INFOPLIST_FILE = Sources/Info.plist;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand All @@ -1534,6 +1537,7 @@
"DTRACE_PROBES_DISABLED=1",
);
INFOPLIST_FILE = Sources/Info.plist;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Profile;
};
Expand Down Expand Up @@ -1599,6 +1603,7 @@
);
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -1612,6 +1617,7 @@
);
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Test;
};
Expand All @@ -1625,6 +1631,7 @@
);
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand All @@ -1638,6 +1645,7 @@
);
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Profile;
};
Expand All @@ -1652,6 +1660,8 @@
"DTRACE_PROBES_DISABLED=1",
);
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Debug;
};
Expand All @@ -1666,6 +1676,8 @@
"DTRACE_PROBES_DISABLED=1",
);
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Test;
};
Expand All @@ -1680,6 +1692,8 @@
"DTRACE_PROBES_DISABLED=1",
);
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Release;
};
Expand All @@ -1694,6 +1708,8 @@
"DTRACE_PROBES_DISABLED=1",
);
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
WATCHOS_DEPLOYMENT_TARGET = 4.0;
};
name = Profile;
};
Expand Down Expand Up @@ -1748,6 +1764,7 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Sources/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.13;
SUPPORTS_MACCATALYST = YES;
};
name = Debug;
Expand All @@ -1760,6 +1777,7 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Sources/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.13;
SUPPORTS_MACCATALYST = YES;
};
name = Release;
Expand All @@ -1769,7 +1787,7 @@
baseConfigurationReference = E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */;
buildSettings = {
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
};
name = Debug;
Expand All @@ -1779,7 +1797,7 @@
baseConfigurationReference = E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */;
buildSettings = {
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
};
name = Release;
Expand All @@ -1791,6 +1809,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -1801,6 +1820,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand All @@ -1809,6 +1829,7 @@
baseConfigurationReference = D047263219E49FE8006002AA /* iOS-Application.xcconfig */;
buildSettings = {
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
};
name = Debug;
Expand All @@ -1818,6 +1839,7 @@
baseConfigurationReference = D047263219E49FE8006002AA /* iOS-Application.xcconfig */;
buildSettings = {
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
};
name = Release;
Expand Down Expand Up @@ -1851,6 +1873,7 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Sources/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.13;
SUPPORTS_MACCATALYST = YES;
};
name = Profile;
Expand All @@ -1860,7 +1883,7 @@
baseConfigurationReference = E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */;
buildSettings = {
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
};
name = Profile;
Expand All @@ -1872,6 +1895,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
};
name = Profile;
};
Expand All @@ -1880,6 +1904,7 @@
baseConfigurationReference = D047263219E49FE8006002AA /* iOS-Application.xcconfig */;
buildSettings = {
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
};
name = Profile;
Expand Down Expand Up @@ -1913,6 +1938,7 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Sources/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.13;
SUPPORTS_MACCATALYST = YES;
};
name = Test;
Expand All @@ -1922,7 +1948,7 @@
baseConfigurationReference = E6124BA9267DF505005A3490 /* macOS-XCTest.xcconfig */;
buildSettings = {
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
};
name = Test;
Expand All @@ -1934,6 +1960,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = Sources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
};
name = Test;
};
Expand All @@ -1942,6 +1969,7 @@
baseConfigurationReference = D047263219E49FE8006002AA /* iOS-Application.xcconfig */;
buildSettings = {
INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
};
name = Test;
Expand Down
25 changes: 15 additions & 10 deletions ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-iOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F1A74281940169200FFFC47"
BlueprintIdentifier = "1F925EAC195C0D6300ED456B"
BuildableName = "Nimble.framework"
BlueprintName = "Nimble-iOS"
BlueprintName = "Nimble"
ReferencedContainer = "container:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -42,9 +42,9 @@
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5A5D117B19473F2100F6D13D"
BlueprintIdentifier = "DAEB6B8D1943873100289F44"
BuildableName = "Quick.framework"
BlueprintName = "Quick-iOS"
BlueprintName = "Quick"
ReferencedContainer = "container:Carthage/Checkouts/Quick/Quick.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -68,8 +68,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO"
Expand All @@ -83,8 +83,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -105,15 +103,22 @@
ReferencedContainer = "container:ReactiveSwift.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Profile"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D047260B19E49F82006002AA"
BuildableName = "ReactiveSwift.framework"
BlueprintName = "ReactiveSwift-iOS"
ReferencedContainer = "container:ReactiveSwift.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
4 changes: 2 additions & 2 deletions ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-macOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F925EAC195C0D6300ED456B"
BuildableName = "Nimble.framework"
BlueprintName = "Nimble-macOS"
BlueprintName = "Nimble"
ReferencedContainer = "container:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -44,7 +44,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DAEB6B8D1943873100289F44"
BuildableName = "Quick.framework"
BlueprintName = "Quick-macOS"
BlueprintName = "Quick"
ReferencedContainer = "container:Carthage/Checkouts/Quick/Quick.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down
25 changes: 15 additions & 10 deletions ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-tvOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F5DF1541BDCA0CE00C3A531"
BlueprintIdentifier = "1F925EAC195C0D6300ED456B"
BuildableName = "Nimble.framework"
BlueprintName = "Nimble-tvOS"
BlueprintName = "Nimble"
ReferencedContainer = "container:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -42,9 +42,9 @@
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1F118CD41BDCA4AB005013A2"
BlueprintIdentifier = "DAEB6B8D1943873100289F44"
BuildableName = "Quick.framework"
BlueprintName = "Quick-tvOS"
BlueprintName = "Quick"
ReferencedContainer = "container:Carthage/Checkouts/Quick/Quick.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -68,8 +68,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO"
Expand All @@ -83,8 +83,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -105,15 +103,22 @@
ReferencedContainer = "container:ReactiveSwift.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "57A4D1AF1BA13D7A00F7D4B1"
BuildableName = "ReactiveSwift.framework"
BlueprintName = "ReactiveSwift-tvOS"
ReferencedContainer = "container:ReactiveSwift.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down

0 comments on commit 715c339

Please sign in to comment.