Skip to content

Commit 261fb50

Browse files
fix: restore iOS 15 in project
1 parent 3d8b2d4 commit 261fb50

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

Agent.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6672,7 +6672,7 @@
66726672
"$(SRCROOT)/modular-crash-reporter-ios/Source/Tests/**",
66736673
);
66746674
INFOPLIST_FILE = "Tests/Unit-Tests/Shared/tests-Info.plist";
6675-
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
6675+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
66766676
LD_RUNPATH_SEARCH_PATHS = (
66776677
"$(inherited)",
66786678
"@executable_path/Frameworks",
@@ -6721,7 +6721,7 @@
67216721
"$(SRCROOT)/modular-crash-reporter-ios/Source/Tests/**",
67226722
);
67236723
INFOPLIST_FILE = "Tests/Unit-Tests/Shared/tests-Info.plist";
6724-
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
6724+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
67256725
LD_RUNPATH_SEARCH_PATHS = (
67266726
"$(inherited)",
67276727
"@executable_path/Frameworks",

Agent/SessionReplay/SwiftUI/NRConditionalMaskView.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ public struct NRConditionalMaskView<Content: View>: View {
3838
}
3939

4040
public var body: some View {
41-
// TODO: Check conditions this should be evaaluated enabled? Previews?
42-
if activated {
41+
42+
let iOS15 = ProcessInfo.processInfo.operatingSystemVersion.majorVersion <= 15
43+
if activated && !iOS15 {
4344
NRMaskedViewRepresentable(maskApplicationText: self.maskApplicationText,
4445
maskUserInputText: self.maskUserInputText,
4546
maskAllImages: self.maskAllImages,

Agent/SessionReplay/SwiftUI/UIHostingViewRecordOrchestrator.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,10 @@ final class UIHostingViewRecordOrchestrator {
280280
let details = makeDetails()
281281

282282
var outputText = ""
283-
if details.isMasked ?? false {
283+
284+
var iOS15 = ProcessInfo.processInfo.operatingSystemVersion.majorVersion <= 15
285+
286+
if iOS15 || (details.isMasked ?? false) {
284287
outputText = String(repeating: "*", count: storage.string.count)
285288
}
286289
else {

Test Harness/NRTestApp/NRTestApp.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,7 +1663,7 @@
16631663
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
16641664
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
16651665
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
1666-
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
1666+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
16671667
LD_RUNPATH_SEARCH_PATHS = (
16681668
"$(inherited)",
16691669
"@executable_path/Frameworks",
@@ -1711,7 +1711,7 @@
17111711
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
17121712
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
17131713
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
1714-
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
1714+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
17151715
LD_RUNPATH_SEARCH_PATHS = (
17161716
"$(inherited)",
17171717
"@executable_path/Frameworks",

Test Harness/NRTestApp/NRTestApp/SwiftUI/InfiniteImageCollectionView.swift

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,16 @@ struct InfiniteImageCollectionView: View {
2424
}
2525

2626
if viewModel.isLoading {
27-
ProgressView()
28-
.frame(height: 50)
29-
.gridCellColumns(2)
27+
if #available(iOS 16.0, *) {
28+
ProgressView()
29+
.frame(height: 50)
30+
.gridCellColumns(2)
31+
} else {
32+
// Fallback on earlier versions
33+
ProgressView()
34+
.frame(height: 50)
35+
36+
}
3037
}
3138
}
3239
.padding()

0 commit comments

Comments
 (0)