Skip to content

Commit 78b8464

Browse files
davdromandavdroman
authored
[CI] Remove min iOS version constraint for UI Tests (#343)
1 parent 121c146 commit 78b8464

File tree

11 files changed

+76
-24
lines changed

11 files changed

+76
-24
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,6 @@ jobs:
149149
name: Run Tests (SwiftUIIntrospect)
150150
run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectTests configuration:Debug
151151

152-
- if: ${{ matrix.platform[0] == 'ios' && matrix.platform[1] >= '14' && matrix.platform[1] <= '16' }}
152+
- if: ${{ matrix.platform[0] == 'ios' && matrix.platform[1] <= '16' }}
153153
name: Run UI Tests (SwiftUIIntrospect)
154154
run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectUITests configuration:Debug

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Changelog
33

44
## master
55

6+
- Infrastructure: removed min iOS version constraint for UI Tests (#343)
7+
68
## [0.12.0]
79

810
- Added: `@Weak` property wrapper (#341)

‎Examples/Showcase/Showcase.xcodeproj/xcshareddata/xcschemes/Showcase.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ ScrollView {
3434

3535
... it will:
3636

37-
- Add `IntrospectionView` as an overlay of `ScrollView`
38-
- Add `IntrospectionAnchorView` as a background of `ScrollView`.
39-
- Traverse through all the subviews between both views until a `UIScrollView` instance (if any) is found.
37+
1. Add marker views in front and behind `ScrollView`.
38+
2. Traverse through all subviews between both marker views until a `UIScrollView` instance (if any) is found.
4039

4140
> **Warning**
4241
>

‎SwiftUIIntrospect.xcworkspace/xcshareddata/xcschemes/Introspect.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SwiftUIIntrospect.xcworkspace/xcshareddata/xcschemes/SwiftUIIntrospect.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Tests/Tests.xcodeproj/project.pbxproj

Lines changed: 63 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@
596596
attributes = {
597597
BuildIndependentTargetsInParallel = 1;
598598
LastSwiftUpdateCheck = 1500;
599-
LastUpgradeCheck = 1420;
599+
LastUpgradeCheck = 1500;
600600
TargetAttributes = {
601601
D50E2F592A2B9F6600BAFB03 = {
602602
TestTargetID = D50E2F4D2A2B9DEE00BAFB03;
@@ -1258,7 +1258,7 @@
12581258
GCC_WARN_UNUSED_FUNCTION = YES;
12591259
GCC_WARN_UNUSED_VARIABLE = YES;
12601260
GENERATE_INFOPLIST_FILE = YES;
1261-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1261+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
12621262
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
12631263
MARKETING_VERSION = 1.0;
12641264
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@@ -1331,7 +1331,7 @@
13311331
GCC_WARN_UNUSED_FUNCTION = YES;
13321332
GCC_WARN_UNUSED_VARIABLE = YES;
13331333
GENERATE_INFOPLIST_FILE = YES;
1334-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1334+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
13351335
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
13361336
MARKETING_VERSION = 1.0;
13371337
MTL_ENABLE_DEBUG_INFO = NO;
@@ -1417,7 +1417,7 @@
14171417
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
14181418
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
14191419
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
1420-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1420+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
14211421
LD_RUNPATH_SEARCH_PATHS = (
14221422
"$(inherited)",
14231423
"@executable_path/Frameworks",
@@ -1500,7 +1500,7 @@
15001500
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
15011501
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
15021502
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
1503-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1503+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
15041504
LD_RUNPATH_SEARCH_PATHS = (
15051505
"$(inherited)",
15061506
"@executable_path/Frameworks",
@@ -1527,9 +1527,39 @@
15271527
D5F0BE4329C0DB9700AD95AB /* Debug */ = {
15281528
isa = XCBuildConfiguration;
15291529
buildSettings = {
1530+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1531+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
1532+
CLANG_WARN_BOOL_CONVERSION = YES;
1533+
CLANG_WARN_COMMA = YES;
1534+
CLANG_WARN_CONSTANT_CONVERSION = YES;
1535+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
1536+
CLANG_WARN_EMPTY_BODY = YES;
1537+
CLANG_WARN_ENUM_CONVERSION = YES;
1538+
CLANG_WARN_INFINITE_RECURSION = YES;
1539+
CLANG_WARN_INT_CONVERSION = YES;
1540+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1541+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1542+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1543+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
1544+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1545+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1546+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
1547+
CLANG_WARN_UNREACHABLE_CODE = YES;
1548+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1549+
DEAD_CODE_STRIPPING = YES;
1550+
ENABLE_STRICT_OBJC_MSGSEND = YES;
1551+
ENABLE_TESTABILITY = YES;
1552+
GCC_NO_COMMON_BLOCKS = YES;
1553+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1554+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
1555+
GCC_WARN_UNDECLARED_SELECTOR = YES;
1556+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
1557+
GCC_WARN_UNUSED_FUNCTION = YES;
1558+
GCC_WARN_UNUSED_VARIABLE = YES;
15301559
GENERATE_INFOPLIST_FILE = YES;
15311560
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
15321561
MACOSX_DEPLOYMENT_TARGET = 11.0;
1562+
ONLY_ACTIVE_ARCH = YES;
15331563
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
15341564
TARGETED_DEVICE_FAMILY = "1,3,2,6";
15351565
TVOS_DEPLOYMENT_TARGET = 13.0;
@@ -1540,6 +1570,34 @@
15401570
D5F0BE4429C0DB9700AD95AB /* Release */ = {
15411571
isa = XCBuildConfiguration;
15421572
buildSettings = {
1573+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1574+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
1575+
CLANG_WARN_BOOL_CONVERSION = YES;
1576+
CLANG_WARN_COMMA = YES;
1577+
CLANG_WARN_CONSTANT_CONVERSION = YES;
1578+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
1579+
CLANG_WARN_EMPTY_BODY = YES;
1580+
CLANG_WARN_ENUM_CONVERSION = YES;
1581+
CLANG_WARN_INFINITE_RECURSION = YES;
1582+
CLANG_WARN_INT_CONVERSION = YES;
1583+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1584+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1585+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1586+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
1587+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1588+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1589+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
1590+
CLANG_WARN_UNREACHABLE_CODE = YES;
1591+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1592+
DEAD_CODE_STRIPPING = YES;
1593+
ENABLE_STRICT_OBJC_MSGSEND = YES;
1594+
GCC_NO_COMMON_BLOCKS = YES;
1595+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1596+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
1597+
GCC_WARN_UNDECLARED_SELECTOR = YES;
1598+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
1599+
GCC_WARN_UNUSED_FUNCTION = YES;
1600+
GCC_WARN_UNUSED_VARIABLE = YES;
15431601
GENERATE_INFOPLIST_FILE = YES;
15441602
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
15451603
MACOSX_DEPLOYMENT_TARGET = 11.0;

‎Tests/Tests.xcodeproj/xcshareddata/xcschemes/LegacySwiftUIIntrospectTests.xcscheme

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -51,15 +51,6 @@
5151
savedToolIdentifier = ""
5252
useCustomWorkingDirectory = "NO"
5353
debugDocumentVersioning = "YES">
54-
<MacroExpansion>
55-
<BuildableReference
56-
BuildableIdentifier = "primary"
57-
BlueprintIdentifier = "D50E2F4D2A2B9DEE00BAFB03"
58-
BuildableName = "LegacyTestsHostApp.app"
59-
BlueprintName = "LegacyTestsHostApp"
60-
ReferencedContainer = "container:Tests.xcodeproj">
61-
</BuildableReference>
62-
</MacroExpansion>
6354
</ProfileAction>
6455
<AnalyzeAction
6556
buildConfiguration = "Debug">

‎Tests/Tests.xcodeproj/xcshareddata/xcschemes/SwiftUIIntrospectTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Tests/UITests/StatusBarStyleUITests.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ final class StatusBarStyleUITests: UITestCase {
77
}
88

99
func test() throws {
10+
guard #available(iOS 14, *) else {
11+
throw XCTSkip("TODO: run on iOS 13 and check in screenshots in order to be able to remove this skip")
12+
}
1013
guard #unavailable(iOS 17) else {
1114
throw XCTSkip("SimulatorStatusMagic stopped working in iOS 17, so we can no longer consistently compare status bar screenshots")
1215
}

‎fastlane/Fastfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ lane :test do |options|
9595
when "SwiftUIIntrospectTests"
9696
is_legacy_sdk ? "LegacySwiftUIIntrospectTests" : "SwiftUIIntrospectTests"
9797
when "SwiftUIIntrospectUITests"
98-
next if is_legacy_sdk
9998
"SwiftUIIntrospectUITests"
10099
else
101100
raise "Unsupported scheme: #{scheme}"

0 commit comments

Comments
 (0)