Skip to content

Fix Merge Conflicts and Merge Release 3.1.2 to Main #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 5, 2025
Merged

Fix Merge Conflicts and Merge Release 3.1.2 to Main #97

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6853d4
Release 3.1.0 Build 36 (#83)
rs929 Mar 25, 2025
e55063b
Main copy updated Package.resolved File (#85)
rs929 Mar 25, 2025
9bddb07
Updated Package Configs (#86)
rs929 Mar 25, 2025
bc10676
Release 3.1.1 Build 38 (#88)
rs929 Mar 27, 2025
68af7c3
Release 3.1.2 Build 39 (#94)
caitlynjin Sep 17, 2025
c955668
Merge branch 'main' into release-copy
MrPeterss Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions Uplift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@
89599A502BD4B4B600DA44DE /* FitnessClassInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89599A4F2BD4B4B600DA44DE /* FitnessClassInstance.swift */; };
896500DC2BB4D33500D822AB /* ClassDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896500DB2BB4D33500D822AB /* ClassDetailView.swift */; };
897703662BA2028D00F9992F /* ClassesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897703652BA2028D00F9992F /* ClassesViewModel.swift */; };
89C10D172CCB2F9E007E753F /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 89C10D162CCB2F9E007E753F /* FirebaseMessaging */; };
897DF9BA2CCDC49B00246B0D /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 897DF9B92CCDC49B00246B0D /* UpliftAPI */; };
897DF9BA2CCDC49B00246B0D /* (null) in Frameworks */ = {isa = PBXBuildFile; };
8983A9A62CFEA077008E84DB /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 8983A9A52CFEA077008E84DB /* UpliftAPI */; };
89950D8A2B992E8400DFB007 /* ClassesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89950D892B992E8400DFB007 /* ClassesView.swift */; };
8996FEE02BDF351800F13C67 /* NextSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8996FEDF2BDF351800F13C67 /* NextSessionCell.swift */; };
899B186D2CA5FAFB00FAC061 /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899B186C2CA5FAFB00FAC061 /* ProfileView.swift */; };
89A652F92D02B00000277A16 /* CapacityRemindersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89A652F62D02B00000277A16 /* CapacityRemindersView.swift */; };
89A652FA2D02B00000277A16 /* RemindersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89A652F72D02B00000277A16 /* RemindersView.swift */; };
89C10D172CCB2F9E007E753F /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 89C10D162CCB2F9E007E753F /* FirebaseMessaging */; };
89C34AA12CA66E9C00C579A5 /* CapacityRemindersViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C34AA02CA66E9000C579A5 /* CapacityRemindersViewModel.swift */; };
89C8658D2BB4779C00758337 /* ClassCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C8658C2BB4779C00758337 /* ClassCell.swift */; };
89CE47422D03F3C700BCB79D /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 89CE47412D03F3C700BCB79D /* UpliftAPI */; };
Expand Down Expand Up @@ -214,10 +214,10 @@
897703652BA2028D00F9992F /* ClassesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassesViewModel.swift; sourceTree = "<group>"; };
89950D892B992E8400DFB007 /* ClassesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassesView.swift; sourceTree = "<group>"; };
8996FEDF2BDF351800F13C67 /* NextSessionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NextSessionCell.swift; sourceTree = "<group>"; };
89C10D222CCB459F007E753F /* Uplift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Uplift.entitlements; sourceTree = "<group>"; };
899B186C2CA5FAFB00FAC061 /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
89A652F62D02B00000277A16 /* CapacityRemindersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacityRemindersView.swift; sourceTree = "<group>"; };
89A652F72D02B00000277A16 /* RemindersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemindersView.swift; sourceTree = "<group>"; };
89C10D222CCB459F007E753F /* Uplift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Uplift.entitlements; sourceTree = "<group>"; };
89C34AA02CA66E9000C579A5 /* CapacityRemindersViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacityRemindersViewModel.swift; sourceTree = "<group>"; };
89C8658C2BB4779C00758337 /* ClassCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassCell.swift; sourceTree = "<group>"; };
89E4FAA92CEFEC3000A952B1 /* CapacitySemiCircleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacitySemiCircleView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -249,7 +249,7 @@
6338EC5F2CE14B54000BBFD3 /* UpliftAPI in Frameworks */,
2E39D82F2B3BCBA400AD238B /* UpliftAPI in Frameworks */,
6338EC5C2CE149AA000BBFD3 /* UpliftAPI in Frameworks */,
897DF9BA2CCDC49B00246B0D /* UpliftAPI in Frameworks */,
897DF9BA2CCDC49B00246B0D /* (null) in Frameworks */,
2E2748D22BCD4EC00023882E /* UpliftAPI in Frameworks */,
63001ADA2CC9AD980082AFFA /* GoogleSignInSwift in Frameworks */,
63A7ABCD2B86B971008D58FB /* UpliftAPI in Frameworks */,
Expand Down Expand Up @@ -616,10 +616,8 @@
636E3D432BBE1F3800B6EFFC /* UpliftAPI */,
2E2748D12BCD4EC00023882E /* UpliftAPI */,
89C10D162CCB2F9E007E753F /* FirebaseMessaging */,
897DF9B92CCDC49B00246B0D /* UpliftAPI */,
63001AD72CC9AD970082AFFA /* GoogleSignIn */,
63001AD92CC9AD970082AFFA /* GoogleSignInSwift */,
897DF9B92CCDC49B00246B0D /* UpliftAPI */,
63001AD72CC9AD970082AFFA /* GoogleSignIn */,
63001AD92CC9AD970082AFFA /* GoogleSignInSwift */,
6338EC5B2CE149AA000BBFD3 /* UpliftAPI */,
Expand Down Expand Up @@ -1023,7 +1021,7 @@
CODE_SIGN_ENTITLEMENTS = Uplift/Uplift.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ZGMCXU7X3U;
ENABLE_PREVIEWS = YES;
Expand All @@ -1044,7 +1042,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.1.1;
MARKETING_VERSION = 3.1.2;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.cornellappdev.uplift.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1068,7 +1066,7 @@
CODE_SIGN_ENTITLEMENTS = Uplift/Uplift.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 36;
CURRENT_PROJECT_VERSION = 39;
DEVELOPMENT_TEAM = ZGMCXU7X3U;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -1088,7 +1086,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.1.1;
MARKETING_VERSION = 3.1.2;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.cornellappdev.uplift.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1273,14 +1271,14 @@
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
};
89C10D162CCB2F9E007E753F /* FirebaseMessaging */ = {
isa = XCSwiftPackageProductDependency;
productName = FirebaseMessaging;
};
8983A9A52CFEA077008E84DB /* UpliftAPI */ = {
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
};
89C10D162CCB2F9E007E753F /* FirebaseMessaging */ = {
isa = XCSwiftPackageProductDependency;
productName = FirebaseMessaging;
};
89CE47412D03F3C700BCB79D /* UpliftAPI */ = {
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
Expand Down