lujiuyin/suixinkan_ios_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate from iOS 17 Observation to iOS 16-compatible Combine architecture.

Browse Source 
Lower deployment target to iOS 16, replace @Observable with ObservableObject, add navigation and UI compatibility shims, and include login smoke UI tests.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
汉秋
2026-06-26 10:16:35 +08:00
parent c32a610ee0
commit 26f4d0e671
127 changed files with 2320 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
suixinkan.xcodeproj/project.pbxproj
View File

@ -22,6 +22,13 @@
remoteGlobalIDString = 939AC7952FE3F832004B22E4;
remoteInfo = suixinkan;
};
B00000072FEF000000000007 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 939AC78E2FE3F832004B22E4 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 939AC7952FE3F832004B22E4;
remoteInfo = suixinkan;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@ -30,6 +37,7 @@
93946BFAF78A845957AF2518 /* Pods-suixinkan.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-suixinkan.debug.xcconfig"; path = "Target Support Files/Pods-suixinkan/Pods-suixinkan.debug.xcconfig"; sourceTree = "<group>"; };
939AC7962FE3F832004B22E4 /* suixinkan.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = suixinkan.app; sourceTree = BUILT_PRODUCTS_DIR; };
A00000012FE9000000000001 /* suixinkanTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = suixinkanTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
B00000012FEF000000000001 /* suixinkanUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = suixinkanUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
D763A7B62050979A1482C545 /* Pods-suixinkanTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-suixinkanTests.debug.xcconfig"; path = "Target Support Files/Pods-suixinkanTests/Pods-suixinkanTests.debug.xcconfig"; sourceTree = "<group>"; };
EB50333A77B5E2F612A2F9BC /* Pods-suixinkanTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-suixinkanTests.release.xcconfig"; path = "Target Support Files/Pods-suixinkanTests/Pods-suixinkanTests.release.xcconfig"; sourceTree = "<group>"; };
EDE192531FA9E2FD908B9EC1 /* Pods_suixinkanTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_suixinkanTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@ -59,6 +67,11 @@
path = suixinkanTests;
sourceTree = "<group>";
};
B00000022FEF000000000002 /* suixinkanUITests */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = suixinkanUITests;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */
/* Begin PBXFrameworksBuildPhase section */
@ -81,6 +94,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B00000052FEF000000000005 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@ -89,6 +109,7 @@
children = (
939AC7982FE3F832004B22E4 /* suixinkan */,
A00000022FE9000000000002 /* suixinkanTests */,
B00000022FEF000000000002 /* suixinkanUITests */,
939AC7972FE3F832004B22E4 /* Products */,
C7EEB11765222926FB482A0E /* Pods */,
F6ABC23A28D8DF8126F325ED /* Frameworks */,
@ -100,6 +121,7 @@
children = (
939AC7962FE3F832004B22E4 /* suixinkan.app */,
A00000012FE9000000000001 /* suixinkanTests.xctest */,
B00000012FEF000000000001 /* suixinkanUITests.xctest */,
);
name = Products;
sourceTree = "<group>";
@ -176,6 +198,27 @@
productReference = A00000012FE9000000000001 /* suixinkanTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
B00000032FEF000000000003 /* suixinkanUITests */ = {
isa = PBXNativeTarget;
buildConfigurationList = B000000B2FEF00000000000B /* Build configuration list for PBXNativeTarget "suixinkanUITests" */;
buildPhases = (
B00000042FEF000000000004 /* Sources */,
B00000052FEF000000000005 /* Frameworks */,
B00000062FEF000000000006 /* Resources */,
);
buildRules = (
);
dependencies = (
B00000082FEF000000000008 /* PBXTargetDependency */,
);
fileSystemSynchronizedGroups = (
B00000022FEF000000000002 /* suixinkanUITests */,
);
name = suixinkanUITests;
productName = suixinkanUITests;
productReference = B00000012FEF000000000001 /* suixinkanUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@ -193,6 +236,10 @@
CreatedOnToolsVersion = 26.5;
TestTargetID = 939AC7952FE3F832004B22E4;
};
B00000032FEF000000000003 = {
CreatedOnToolsVersion = 26.5;
TestTargetID = 939AC7952FE3F832004B22E4;
};
};
};
buildConfigurationList = 939AC7912FE3F832004B22E4 /* Build configuration list for PBXProject "suixinkan" */;
@ -216,6 +263,7 @@
targets = (
939AC7952FE3F832004B22E4 /* suixinkan */,
A00000032FE9000000000003 /* suixinkanTests */,
B00000032FEF000000000003 /* suixinkanUITests */,
);
};
/* End PBXProject section */
@ -235,6 +283,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B00000062FEF000000000006 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@ -320,6 +375,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B00000042FEF000000000004 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@ -328,6 +390,11 @@
target = 939AC7952FE3F832004B22E4 /* suixinkan */;
targetProxy = A00000072FE9000000000007 /* PBXContainerItemProxy */;
};
B00000082FEF000000000008 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 939AC7952FE3F832004B22E4 /* suixinkan */;
targetProxy = B00000072FEF000000000007 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@ -467,7 +534,7 @@
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = suixinkan/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -505,7 +572,7 @@
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = suixinkan/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -539,7 +606,7 @@
ENABLE_USER_SCRIPT_SANDBOXING = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -575,7 +642,7 @@
ENABLE_USER_SCRIPT_SANDBOXING = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -600,6 +667,72 @@
};
name = Release;
};
B00000092FEF000000000009 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 56GVN5RNVN;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.yuanzhixiang.suixinkanUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
TEST_TARGET_NAME = suixinkan;
};
name = Debug;
};
B000000A2FEF00000000000A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 56GVN5RNVN;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.yuanzhixiang.suixinkanUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
TEST_TARGET_NAME = suixinkan;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@ -630,6 +763,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B000000B2FEF00000000000B /* Build configuration list for PBXNativeTarget "suixinkanUITests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B00000092FEF000000000009 /* Debug */,
B000000A2FEF00000000000A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */

11
suixinkan.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -1,5 +1,5 @@
{
"originHash" : "40830d6592be5c997cf1b8848d6a8791afd48ce9a5e48a1f297fbae4a6de3783",
"originHash" : "6f02892b99a60872df0561ceead8949f780d607eccd0a776d8f299248fc13a72",
"pins" : [
{
"identity" : "alibabacloud-oss-swift-sdk-v2",
@ -19,6 +19,15 @@
"version" : "8.10.0"
}
},
{
"identity" : "lottie-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/airbnb/lottie-ios.git",
"state" : {
"revision" : "f4db77d7feacba0c2360b84a40c38a6ce8ff399d",
"version" : "4.6.1"
}
},
{
"identity" : "swift-asn1",
"kind" : "remoteSourceControl",

24
suixinkan.xcodeproj/xcshareddata/xcschemes/suixinkan.xcscheme
View File

@ -35,6 +35,20 @@
ReferencedContainer = "container:suixinkan.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B00000032FEF000000000003"
BuildableName = "suixinkanUITests.xctest"
BlueprintName = "suixinkanUITests"
ReferencedContainer = "container:suixinkan.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
@ -64,6 +78,16 @@
ReferencedContainer = "container:suixinkan.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B00000032FEF000000000003"
BuildableName = "suixinkanUITests.xctest"
BlueprintName = "suixinkanUITests"
ReferencedContainer = "container:suixinkan.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction