Skip to content

Commit

Permalink
Upgrade to SpeziAccount 2.0 (#83)
Browse files Browse the repository at this point in the history 
# Upgrade to SpeziAccount 2.0

## ♻️ Current situation & Problem
This PR upgrade the Spezi Template Application to the upcoming
SpeziAccount release.


## ⚙️ Release Notes 
--


## 📚 Documentation
--


## ✅ Testing
UI test times were slightly optimized, adding a new FeatureFlag to
automatically set up a test account upon app start.


## 📝 Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md):
- [x] I agree to follow the [Code of
Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md).
  • Loading branch information
@Supereg
Supereg authored Aug 23, 2024
1 parent e662bd4 commit d6e8bb3
Show file tree
Hide file tree
Showing 21 changed files with 376 additions and 334 deletions.
89 changes: 58 additions & 31 deletions TemplateApplication.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
2FA0BFED2ACC977500E0EF83 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2FA0BFEC2ACC977500E0EF83 /* Localizable.xcstrings */; };
2FB099AF2A875DF100B20952 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 2FB099AE2A875DF100B20952 /* FirebaseAuth */; };
2FB099B12A875DF100B20952 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 2FB099B02A875DF100B20952 /* FirebaseFirestore */; };
2FB099B32A875DF100B20952 /* FirebaseFirestoreSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 2FB099B22A875DF100B20952 /* FirebaseFirestoreSwift */; };
2FB099B62A875E2B00B20952 /* HealthKitOnFHIR in Frameworks */ = {isa = PBXBuildFile; productRef = 2FB099B52A875E2B00B20952 /* HealthKitOnFHIR */; };
2FBD738C2A3BD150004228E7 /* SpeziScheduler in Frameworks */ = {isa = PBXBuildFile; productRef = 2FBD738B2A3BD150004228E7 /* SpeziScheduler */; };
2FC3439029EE6346002D773C /* SocialSupportQuestionnaire.json in Resources */ = {isa = PBXBuildFile; fileRef = 2FE5DC5529EDD811004B9AB4 /* SocialSupportQuestionnaire.json */; };
Expand Down Expand Up @@ -67,6 +66,7 @@
97D73D6A2AD860AD00B47FA0 /* SpeziFirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 97D73D692AD860AD00B47FA0 /* SpeziFirebaseStorage */; };
A92E4DF02BAA001100AC8DE8 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = A92E4DEF2BAA001100AC8DE8 /* OrderedCollections */; };
A9720E432ABB68CC00872D23 /* AccountSetupHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9720E422ABB68CC00872D23 /* AccountSetupHeader.swift */; };
A9A3DCC82C75CBBD00FC9B69 /* FirebaseConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A3DCC72C75CB9A00FC9B69 /* FirebaseConfiguration.swift */; };
A9D83F962B083794000D0C78 /* SpeziFirebaseAccountStorage in Frameworks */ = {isa = PBXBuildFile; productRef = A9D83F952B083794000D0C78 /* SpeziFirebaseAccountStorage */; };
A9DFE8A92ABE551400428242 /* AccountButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9DFE8A82ABE551400428242 /* AccountButton.swift */; };
A9FE7AD02AA39BAB0077B045 /* AccountSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FE7ACF2AA39BAB0077B045 /* AccountSheet.swift */; };
Expand Down Expand Up @@ -131,6 +131,7 @@
653A256B28338800005D4D48 /* SchedulerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SchedulerTests.swift; sourceTree = "<group>"; };
653A258928339462005D4D48 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A9720E422ABB68CC00872D23 /* AccountSetupHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSetupHeader.swift; sourceTree = "<group>"; };
A9A3DCC72C75CB9A00FC9B69 /* FirebaseConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseConfiguration.swift; sourceTree = "<group>"; };
A9DFE8A82ABE551400428242 /* AccountButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountButton.swift; sourceTree = "<group>"; };
A9FE7ACF2AA39BAB0077B045 /* AccountSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSheet.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -146,7 +147,6 @@
97D73D6A2AD860AD00B47FA0 /* SpeziFirebaseStorage in Frameworks */,
2FE5DC6729EDD894004B9AB4 /* SpeziContact in Frameworks */,
2FE5DC8429EDD934004B9AB4 /* SpeziQuestionnaire in Frameworks */,
2FB099B32A875DF100B20952 /* FirebaseFirestoreSwift in Frameworks */,
2FB099B12A875DF100B20952 /* FirebaseFirestore in Frameworks */,
A9D83F962B083794000D0C78 /* SpeziFirebaseAccountStorage in Frameworks */,
2FB099B62A875E2B00B20952 /* HealthKitOnFHIR in Frameworks */,
Expand Down Expand Up @@ -286,6 +286,7 @@
2F4E23822989D51F0013F3D9 /* TemplateApplicationTestingSetup.swift */,
A9720E412ABB68B300872D23 /* Account */,
2FE5DC2729EDD38D004B9AB4 /* Contacts */,
A9A3DCC62C75CB8D00FC9B69 /* Firestore */,
2FE5DC2829EDD398004B9AB4 /* Onboarding */,
2FE5DC2D29EDD792004B9AB4 /* Resources */,
2FE5DC3B29EDD7D0004B9AB4 /* Schedule */,
Expand Down Expand Up @@ -331,6 +332,14 @@
path = Account;
sourceTree = "<group>";
};
A9A3DCC62C75CB8D00FC9B69 /* Firestore */ = {
isa = PBXGroup;
children = (
A9A3DCC72C75CB9A00FC9B69 /* FirebaseConfiguration.swift */,
);
path = Firestore;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -345,7 +354,7 @@
buildRules = (
);
dependencies = (
2F66D20F2BB723200010D555 /* PBXTargetDependency */,
A9E1D3432C67A3F800CED217 /* PBXTargetDependency */,
56E7083D2BB06FCA00B08F0A /* PBXTargetDependency */,
);
name = TemplateApplication;
Expand All @@ -366,7 +375,6 @@
2FE5DC8029EDD91D004B9AB4 /* SpeziOnboarding */,
2FB099AE2A875DF100B20952 /* FirebaseAuth */,
2FB099B02A875DF100B20952 /* FirebaseFirestore */,
2FB099B22A875DF100B20952 /* FirebaseFirestoreSwift */,
2FB099B52A875E2B00B20952 /* HealthKitOnFHIR */,
9739A0C52AD7B5730084BEA5 /* FirebaseStorage */,
97D73D692AD860AD00B47FA0 /* SpeziFirebaseStorage */,
Expand All @@ -390,6 +398,7 @@
buildRules = (
);
dependencies = (
A9E1D3462C67B0A300CED217 /* PBXTargetDependency */,
653A255F28338800005D4D48 /* PBXTargetDependency */,
);
name = TemplateApplicationTests;
Expand All @@ -408,6 +417,7 @@
buildRules = (
);
dependencies = (
A9E1D3482C67B0A700CED217 /* PBXTargetDependency */,
653A256928338800005D4D48 /* PBXTargetDependency */,
);
name = TemplateApplicationUITests;
Expand Down Expand Up @@ -525,6 +535,7 @@
2FC975A82978F11A00BA99FE /* Home.swift in Sources */,
2FE5DC4E29EDD7FA004B9AB4 /* ScheduleView.swift in Sources */,
A9DFE8A92ABE551400428242 /* AccountButton.swift in Sources */,
A9A3DCC82C75CBBD00FC9B69 /* FirebaseConfiguration.swift in Sources */,
2FE5DC3729EDD7CA004B9AB4 /* OnboardingFlow.swift in Sources */,
2F1AC9DF2B4E840E00C24973 /* TemplateApplication.docc in Sources */,
2FF53D8D2A8729D600042B76 /* TemplateApplicationStandard.swift in Sources */,
Expand Down Expand Up @@ -568,10 +579,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
2F66D20F2BB723200010D555 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = 2F66D20E2BB723200010D555 /* SwiftLintPlugin */;
};
56E7083D2BB06FCA00B08F0A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = 56E7083C2BB06FCA00B08F0A /* SwiftPackageListPlugin */;
Expand All @@ -586,6 +593,18 @@
target = 653A254C283387FE005D4D48 /* TemplateApplication */;
targetProxy = 653A256828338800005D4D48 /* PBXContainerItemProxy */;
};
A9E1D3432C67A3F800CED217 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = A9E1D3422C67A3F800CED217 /* SwiftLintBuildToolPlugin */;
};
A9E1D3462C67B0A300CED217 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = A9E1D3452C67B0A300CED217 /* SwiftLintBuildToolPlugin */;
};
A9E1D3482C67B0A700CED217 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = A9E1D3472C67B0A700CED217 /* SwiftLintBuildToolPlugin */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -649,6 +668,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = TEST;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_VERSION = 5.0;
};
name = Test;
Expand Down Expand Up @@ -792,6 +812,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_VERSION = 5.0;
};
name = Debug;
Expand Down Expand Up @@ -849,6 +870,7 @@
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
Expand Down Expand Up @@ -1066,15 +1088,15 @@
repositoryURL = "https://github.com/StanfordSpezi/SpeziScheduler.git";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 0.8.2;
minimumVersion = 0.8.3;
};
};
2F49B7742980407B00BCB272 /* XCRemoteSwiftPackageReference "Spezi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/Spezi";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.4.0;
minimumVersion = 1.7.1;
};
};
2F66D20D2BB723180010D555 /* XCRemoteSwiftPackageReference "SwiftLint" */ = {
Expand All @@ -1098,31 +1120,31 @@
repositoryURL = "https://github.com/StanfordSpezi/SpeziAccount.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.2.0;
minimumVersion = "2.0.0-beta.4";
};
};
2FE5DC6529EDD894004B9AB4 /* XCRemoteSwiftPackageReference "SpeziContact" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziContact.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.0.0;
minimumVersion = 1.0.2;
};
};
2FE5DC7029EDD8D3004B9AB4 /* XCRemoteSwiftPackageReference "SpeziHealthKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziHealthKit.git";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 0.5.0;
minimumVersion = 0.6.0;
};
};
2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziFirebase.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.1.0;
minimumVersion = "2.0.0-beta.1";
};
};
2FE5DC8229EDD934004B9AB4 /* XCRemoteSwiftPackageReference "SpeziQuestionnaire" */ = {
Expand All @@ -1138,31 +1160,31 @@
repositoryURL = "https://github.com/StanfordSpezi/SpeziStorage.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.0.0;
minimumVersion = 1.1.2;
};
};
2FE5DC8D29EDD980004B9AB4 /* XCRemoteSwiftPackageReference "SpeziViews" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziViews.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.5.0;
minimumVersion = 1.6.0;
};
};
2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 10.17.0;
minimumVersion = 11.0.0;
};
};
2FE5DC9729EDD9D9004B9AB4 /* XCRemoteSwiftPackageReference "XCTestExtensions" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordBDHG/XCTestExtensions.git";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 0.4.11;
kind = upToNextMajorVersion;
minimumVersion = 1.0.0;
};
};
2FE5DC9A29EDD9EF004B9AB4 /* XCRemoteSwiftPackageReference "XCTHealthKit" */ = {
Expand All @@ -1186,15 +1208,15 @@
repositoryURL = "https://github.com/StanfordSpezi/SpeziLicense";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 0.1.0;
minimumVersion = 0.1.1;
};
};
97F466E62A76BBEE005DC9B4 /* XCRemoteSwiftPackageReference "SpeziOnboarding" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/StanfordSpezi/SpeziOnboarding";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.2.0;
minimumVersion = 1.2.1;
};
};
A92E4DEE2BAA001100AC8DE8 /* XCRemoteSwiftPackageReference "swift-collections" */ = {
Expand All @@ -1218,11 +1240,6 @@
package = 2F49B7742980407B00BCB272 /* XCRemoteSwiftPackageReference "Spezi" */;
productName = Spezi;
};
2F66D20E2BB723200010D555 /* SwiftLintPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = 2F66D20D2BB723180010D555 /* XCRemoteSwiftPackageReference "SwiftLint" */;
productName = "plugin:SwiftLintPlugin";
};
2FB099AE2A875DF100B20952 /* FirebaseAuth */ = {
isa = XCSwiftPackageProductDependency;
package = 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
Expand All @@ -1233,11 +1250,6 @@
package = 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestore;
};
2FB099B22A875DF100B20952 /* FirebaseFirestoreSwift */ = {
isa = XCSwiftPackageProductDependency;
package = 2FE5DC9029EDD9C3004B9AB4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestoreSwift;
};
2FB099B52A875E2B00B20952 /* HealthKitOnFHIR */ = {
isa = XCSwiftPackageProductDependency;
package = 2FB099B42A875E2B00B20952 /* XCRemoteSwiftPackageReference "HealthKitOnFHIR" */;
Expand Down Expand Up @@ -1347,6 +1359,21 @@
package = 2FE5DC7329EDD8E6004B9AB4 /* XCRemoteSwiftPackageReference "SpeziFirebase" */;
productName = SpeziFirebaseAccountStorage;
};
A9E1D3422C67A3F800CED217 /* SwiftLintBuildToolPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = 2F66D20D2BB723180010D555 /* XCRemoteSwiftPackageReference "SwiftLint" */;
productName = "plugin:SwiftLintBuildToolPlugin";
};
A9E1D3452C67B0A300CED217 /* SwiftLintBuildToolPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = 2F66D20D2BB723180010D555 /* XCRemoteSwiftPackageReference "SwiftLint" */;
productName = "plugin:SwiftLintBuildToolPlugin";
};
A9E1D3472C67B0A700CED217 /* SwiftLintBuildToolPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = 2F66D20D2BB723180010D555 /* XCRemoteSwiftPackageReference "SwiftLint" */;
productName = "plugin:SwiftLintBuildToolPlugin";
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 653A2545283387FE005D4D48 /* Project object */;
Expand Down
Loading

0 comments on commit d6e8bb3

Please sign in to comment.