Skip to content

Commit 0a71dce

Browse files
gh123mangh123man
committed
Support iOS 26
1 parent 5a24079 commit 0a71dce

File tree

5 files changed

+6
-225
lines changed

5 files changed

+6
-225
lines changed

‎Examples/RefresherTest.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 219 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,12 @@
1616
D3A3F333280F186C00BB28F1 /* Refresher in Frameworks */ = {isa = PBXBuildFile; productRef = D3A3F332280F186C00BB28F1 /* Refresher */; };
1717
/* End PBXBuildFile section */
1818

19-
/* Begin PBXContainerItemProxy section */
20-
D3A3F2EF280CBFEF00BB28F1 /* PBXContainerItemProxy */ = {
21-
isa = PBXContainerItemProxy;
22-
containerPortal = D3A3F2D5280CBFEE00BB28F1 /* Project object */;
23-
proxyType = 1;
24-
remoteGlobalIDString = D3A3F2E0280CBFEF00BB28F1;
25-
remoteInfo = "RefresherTest (iOS)";
26-
};
27-
D3A3F2FB280CBFEF00BB28F1 /* PBXContainerItemProxy */ = {
28-
isa = PBXContainerItemProxy;
29-
containerPortal = D3A3F2D5280CBFEE00BB28F1 /* Project object */;
30-
proxyType = 1;
31-
remoteGlobalIDString = D3A3F2E6280CBFEF00BB28F1;
32-
remoteInfo = "RefresherTest (macOS)";
33-
};
34-
/* End PBXContainerItemProxy section */
35-
3619
/* Begin PBXFileReference section */
3720
D3A3F2DA280CBFEE00BB28F1 /* RefresherTestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefresherTestApp.swift; sourceTree = "<group>"; };
3821
D3A3F2DB280CBFEE00BB28F1 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
3922
D3A3F2DC280CBFEF00BB28F1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4023
D3A3F2E1280CBFEF00BB28F1 /* RefresherTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RefresherTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
4124
D3A3F2E7280CBFEF00BB28F1 /* RefresherTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RefresherTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
42-
D3A3F2EE280CBFEF00BB28F1 /* Tests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
43-
D3A3F2FA280CBFEF00BB28F1 /* Tests macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
4425
D3A3F331280F185E00BB28F1 /* Refresher */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Refresher; path = ..; sourceTree = "<group>"; };
4526
/* End PBXFileReference section */
4627

@@ -60,20 +41,6 @@
6041
);
6142
runOnlyForDeploymentPostprocessing = 0;
6243
};
63-
D3A3F2EB280CBFEF00BB28F1 /* Frameworks */ = {
64-
isa = PBXFrameworksBuildPhase;
65-
buildActionMask = 2147483647;
66-
files = (
67-
);
68-
runOnlyForDeploymentPostprocessing = 0;
69-
};
70-
D3A3F2F7280CBFEF00BB28F1 /* Frameworks */ = {
71-
isa = PBXFrameworksBuildPhase;
72-
buildActionMask = 2147483647;
73-
files = (
74-
);
75-
runOnlyForDeploymentPostprocessing = 0;
76-
};
7744
/* End PBXFrameworksBuildPhase section */
7845

7946
/* Begin PBXGroup section */
@@ -95,8 +62,6 @@
9562
children = (
9663
D3A3F2E1280CBFEF00BB28F1 /* RefresherTest.app */,
9764
D3A3F2E7280CBFEF00BB28F1 /* RefresherTest.app */,
98-
D3A3F2EE280CBFEF00BB28F1 /* Tests iOS.xctest */,
99-
D3A3F2FA280CBFEF00BB28F1 /* Tests macOS.xctest */,
10065
);
10166
name = Products;
10267
sourceTree = "<group>";
@@ -155,42 +120,6 @@
155120
productReference = D3A3F2E7280CBFEF00BB28F1 /* RefresherTest.app */;
156121
productType = "com.apple.product-type.application";
157122
};
158-
D3A3F2ED280CBFEF00BB28F1 /* Tests iOS */ = {
159-
isa = PBXNativeTarget;
160-
buildConfigurationList = D3A3F310280CBFEF00BB28F1 /* Build configuration list for PBXNativeTarget "Tests iOS" */;
161-
buildPhases = (
162-
D3A3F2EA280CBFEF00BB28F1 /* Sources */,
163-
D3A3F2EB280CBFEF00BB28F1 /* Frameworks */,
164-
D3A3F2EC280CBFEF00BB28F1 /* Resources */,
165-
);
166-
buildRules = (
167-
);
168-
dependencies = (
169-
D3A3F2F0280CBFEF00BB28F1 /* PBXTargetDependency */,
170-
);
171-
name = "Tests iOS";
172-
productName = "Tests iOS";
173-
productReference = D3A3F2EE280CBFEF00BB28F1 /* Tests iOS.xctest */;
174-
productType = "com.apple.product-type.bundle.ui-testing";
175-
};
176-
D3A3F2F9280CBFEF00BB28F1 /* Tests macOS */ = {
177-
isa = PBXNativeTarget;
178-
buildConfigurationList = D3A3F313280CBFEF00BB28F1 /* Build configuration list for PBXNativeTarget "Tests macOS" */;
179-
buildPhases = (
180-
D3A3F2F6280CBFEF00BB28F1 /* Sources */,
181-
D3A3F2F7280CBFEF00BB28F1 /* Frameworks */,
182-
D3A3F2F8280CBFEF00BB28F1 /* Resources */,
183-
);
184-
buildRules = (
185-
);
186-
dependencies = (
187-
D3A3F2FC280CBFEF00BB28F1 /* PBXTargetDependency */,
188-
);
189-
name = "Tests macOS";
190-
productName = "Tests macOS";
191-
productReference = D3A3F2FA280CBFEF00BB28F1 /* Tests macOS.xctest */;
192-
productType = "com.apple.product-type.bundle.ui-testing";
193-
};
194123
/* End PBXNativeTarget section */
195124

196125
/* Begin PBXProject section */
@@ -207,14 +136,6 @@
207136
D3A3F2E6280CBFEF00BB28F1 = {
208137
CreatedOnToolsVersion = 13.3.1;
209138
};
210-
D3A3F2ED280CBFEF00BB28F1 = {
211-
CreatedOnToolsVersion = 13.3.1;
212-
TestTargetID = D3A3F2E0280CBFEF00BB28F1;
213-
};
214-
D3A3F2F9280CBFEF00BB28F1 = {
215-
CreatedOnToolsVersion = 13.3.1;
216-
TestTargetID = D3A3F2E6280CBFEF00BB28F1;
217-
};
218139
};
219140
};
220141
buildConfigurationList = D3A3F2D8280CBFEE00BB28F1 /* Build configuration list for PBXProject "RefresherTest" */;
@@ -232,8 +153,6 @@
232153
targets = (
233154
D3A3F2E0280CBFEF00BB28F1 /* RefresherTest (iOS) */,
234155
D3A3F2E6280CBFEF00BB28F1 /* RefresherTest (macOS) */,
235-
D3A3F2ED280CBFEF00BB28F1 /* Tests iOS */,
236-
D3A3F2F9280CBFEF00BB28F1 /* Tests macOS */,
237156
);
238157
};
239158
/* End PBXProject section */
@@ -255,20 +174,6 @@
255174
);
256175
runOnlyForDeploymentPostprocessing = 0;
257176
};
258-
D3A3F2EC280CBFEF00BB28F1 /* Resources */ = {
259-
isa = PBXResourcesBuildPhase;
260-
buildActionMask = 2147483647;
261-
files = (
262-
);
263-
runOnlyForDeploymentPostprocessing = 0;
264-
};
265-
D3A3F2F8280CBFEF00BB28F1 /* Resources */ = {
266-
isa = PBXResourcesBuildPhase;
267-
buildActionMask = 2147483647;
268-
files = (
269-
);
270-
runOnlyForDeploymentPostprocessing = 0;
271-
};
272177
/* End PBXResourcesBuildPhase section */
273178

274179
/* Begin PBXSourcesBuildPhase section */
@@ -290,35 +195,8 @@
290195
);
291196
runOnlyForDeploymentPostprocessing = 0;
292197
};
293-
D3A3F2EA280CBFEF00BB28F1 /* Sources */ = {
294-
isa = PBXSourcesBuildPhase;
295-
buildActionMask = 2147483647;
296-
files = (
297-
);
298-
runOnlyForDeploymentPostprocessing = 0;
299-
};
300-
D3A3F2F6280CBFEF00BB28F1 /* Sources */ = {
301-
isa = PBXSourcesBuildPhase;
302-
buildActionMask = 2147483647;
303-
files = (
304-
);
305-
runOnlyForDeploymentPostprocessing = 0;
306-
};
307198
/* End PBXSourcesBuildPhase section */
308199

309-
/* Begin PBXTargetDependency section */
310-
D3A3F2F0280CBFEF00BB28F1 /* PBXTargetDependency */ = {
311-
isa = PBXTargetDependency;
312-
target = D3A3F2E0280CBFEF00BB28F1 /* RefresherTest (iOS) */;
313-
targetProxy = D3A3F2EF280CBFEF00BB28F1 /* PBXContainerItemProxy */;
314-
};
315-
D3A3F2FC280CBFEF00BB28F1 /* PBXTargetDependency */ = {
316-
isa = PBXTargetDependency;
317-
target = D3A3F2E6280CBFEF00BB28F1 /* RefresherTest (macOS) */;
318-
targetProxy = D3A3F2FB280CBFEF00BB28F1 /* PBXContainerItemProxy */;
319-
};
320-
/* End PBXTargetDependency section */
321-
322200
/* Begin XCBuildConfiguration section */
323201
D3A3F308280CBFEF00BB28F1 /* Debug */ = {
324202
isa = XCBuildConfiguration;
@@ -546,85 +424,6 @@
546424
};
547425
name = Release;
548426
};
549-
D3A3F311280CBFEF00BB28F1 /* Debug */ = {
550-
isa = XCBuildConfiguration;
551-
buildSettings = {
552-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
553-
CODE_SIGN_STYLE = Automatic;
554-
CURRENT_PROJECT_VERSION = 1;
555-
DEVELOPMENT_TEAM = 79TGW25V5A;
556-
GENERATE_INFOPLIST_FILE = YES;
557-
IPHONEOS_DEPLOYMENT_TARGET = 15.4;
558-
MARKETING_VERSION = 1.0;
559-
PRODUCT_BUNDLE_IDENTIFIER = "bugtest.Tests-iOS";
560-
PRODUCT_NAME = "$(TARGET_NAME)";
561-
SDKROOT = iphoneos;
562-
SWIFT_EMIT_LOC_STRINGS = NO;
563-
SWIFT_VERSION = 5.0;
564-
TARGETED_DEVICE_FAMILY = "1,2";
565-
TEST_TARGET_NAME = "RefresherTest (iOS)";
566-
};
567-
name = Debug;
568-
};
569-
D3A3F312280CBFEF00BB28F1 /* Release */ = {
570-
isa = XCBuildConfiguration;
571-
buildSettings = {
572-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
573-
CODE_SIGN_STYLE = Automatic;
574-
CURRENT_PROJECT_VERSION = 1;
575-
DEVELOPMENT_TEAM = 79TGW25V5A;
576-
GENERATE_INFOPLIST_FILE = YES;
577-
IPHONEOS_DEPLOYMENT_TARGET = 15.4;
578-
MARKETING_VERSION = 1.0;
579-
PRODUCT_BUNDLE_IDENTIFIER = "bugtest.Tests-iOS";
580-
PRODUCT_NAME = "$(TARGET_NAME)";
581-
SDKROOT = iphoneos;
582-
SWIFT_EMIT_LOC_STRINGS = NO;
583-
SWIFT_VERSION = 5.0;
584-
TARGETED_DEVICE_FAMILY = "1,2";
585-
TEST_TARGET_NAME = "RefresherTest (iOS)";
586-
VALIDATE_PRODUCT = YES;
587-
};
588-
name = Release;
589-
};
590-
D3A3F314280CBFEF00BB28F1 /* Debug */ = {
591-
isa = XCBuildConfiguration;
592-
buildSettings = {
593-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
594-
CODE_SIGN_STYLE = Automatic;
595-
CURRENT_PROJECT_VERSION = 1;
596-
DEVELOPMENT_TEAM = 79TGW25V5A;
597-
GENERATE_INFOPLIST_FILE = YES;
598-
MACOSX_DEPLOYMENT_TARGET = 12.3;
599-
MARKETING_VERSION = 1.0;
600-
PRODUCT_BUNDLE_IDENTIFIER = "bugtest.Tests-macOS";
601-
PRODUCT_NAME = "$(TARGET_NAME)";
602-
SDKROOT = macosx;
603-
SWIFT_EMIT_LOC_STRINGS = NO;
604-
SWIFT_VERSION = 5.0;
605-
TEST_TARGET_NAME = "RefresherTest (macOS)";
606-
};
607-
name = Debug;
608-
};
609-
D3A3F315280CBFEF00BB28F1 /* Release */ = {
610-
isa = XCBuildConfiguration;
611-
buildSettings = {
612-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
613-
CODE_SIGN_STYLE = Automatic;
614-
CURRENT_PROJECT_VERSION = 1;
615-
DEVELOPMENT_TEAM = 79TGW25V5A;
616-
GENERATE_INFOPLIST_FILE = YES;
617-
MACOSX_DEPLOYMENT_TARGET = 12.3;
618-
MARKETING_VERSION = 1.0;
619-
PRODUCT_BUNDLE_IDENTIFIER = "bugtest.Tests-macOS";
620-
PRODUCT_NAME = "$(TARGET_NAME)";
621-
SDKROOT = macosx;
622-
SWIFT_EMIT_LOC_STRINGS = NO;
623-
SWIFT_VERSION = 5.0;
624-
TEST_TARGET_NAME = "RefresherTest (macOS)";
625-
};
626-
name = Release;
627-
};
628427
/* End XCBuildConfiguration section */
629428

630429
/* Begin XCConfigurationList section */
@@ -655,24 +454,6 @@
655454
defaultConfigurationIsVisible = 0;
656455
defaultConfigurationName = Release;
657456
};
658-
D3A3F310280CBFEF00BB28F1 /* Build configuration list for PBXNativeTarget "Tests iOS" */ = {
659-
isa = XCConfigurationList;
660-
buildConfigurations = (
661-
D3A3F311280CBFEF00BB28F1 /* Debug */,
662-
D3A3F312280CBFEF00BB28F1 /* Release */,
663-
);
664-
defaultConfigurationIsVisible = 0;
665-
defaultConfigurationName = Release;
666-
};
667-
D3A3F313280CBFEF00BB28F1 /* Build configuration list for PBXNativeTarget "Tests macOS" */ = {
668-
isa = XCConfigurationList;
669-
buildConfigurations = (
670-
D3A3F314280CBFEF00BB28F1 /* Debug */,
671-
D3A3F315280CBFEF00BB28F1 /* Release */,
672-
);
673-
defaultConfigurationIsVisible = 0;
674-
defaultConfigurationName = Release;
675-
};
676457
/* End XCConfigurationList section */
677458

678459
/* Begin XCSwiftPackageProductDependency section */

‎Examples/RefresherTest.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.resolved‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let package = Package(
1717
],
1818
dependencies: [
1919
// Dependencies declare other packages that this package depends on.
20-
.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "1.2.0"),
20+
.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "1.4.0-beta.2"),
2121
.package(url: "https://github.com/gh123man/SwiftUI-RenderLock", from: "1.0.2"),
2222
],
2323
targets: [

‎Sources/Refresher/Refresher.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public struct RefreshableScrollView<Content: View, RefreshView: View>: View {
219219
refreshSpinner
220220
}
221221
}
222-
.introspect(.scrollView, on: .iOS(.v14, .v15, .v16, .v17, .v18)) { scrollView in
222+
.introspect(.scrollView, on: .iOS(.v14, .v15, .v16, .v17, .v18, .v26)) { scrollView in
223223
DispatchQueue.main.async {
224224
uiScrollView = scrollView
225225
}

0 commit comments

Comments
 (0)