Skip to content

Merge Release 3.1.2 Build 44 into Main #101

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

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Merge Release 3.1.2 Build 44 into Main #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 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
18eeefa
Update ci_post_clone.sh with GRAPHQL_SCHEMA
MrPeterss Oct 5, 2025
76f8c49
Use SwiftUI instead of SwiftUICore
MrPeterss Oct 5, 2025
f5a7e91
Release 3.1.3 Build 40 (#100)
JiwonJeong414 Oct 8, 2025
4e758a8
Release 3.1.3 Build 44
MrPeterss Oct 8, 2025
ebf3180
Merge branch 'main' into release-copy
MrPeterss Oct 8, 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
8 changes: 4 additions & 4 deletions Uplift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@
CODE_SIGN_ENTITLEMENTS = Uplift/Uplift.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 40;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ZGMCXU7X3U;
ENABLE_PREVIEWS = YES;
Expand All @@ -1066,7 +1066,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.1.2;
MARKETING_VERSION = 3.1.3;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.cornellappdev.uplift.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1090,7 +1090,7 @@
CODE_SIGN_ENTITLEMENTS = Uplift/Uplift.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 40;
DEVELOPMENT_TEAM = ZGMCXU7X3U;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -1110,7 +1110,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.1.2;
MARKETING_VERSION = 3.1.3;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = com.cornellappdev.uplift.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
11 changes: 10 additions & 1 deletion Uplift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Uplift.xcodeproj/xcshareddata/xcschemes/Uplift.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand Down
1 change: 0 additions & 1 deletion ci_scripts/ci_post_clone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ wget -O ../UpliftSecrets/Keys.xcconfig "$KEYS"
wget -O ../UpliftSecrets/GoogleService-Info.plist "$GOOGLE_PLIST"
wget -O ../UpliftSecrets/schema.graphqls "$GRAPHQL_SCHEMA"


echo "Generating API file"
../apollo-ios-cli generate -p "../UpliftSecrets/apollo-codegen-config-prod.json" -f

Expand Down