Skip to content

Commit 953132c

Browse files
ZombieBread123ZombieBread123
committed
2 parents ee21fcf + 53c9826 commit 953132c

25 files changed

+658
-73
lines changed

‎frontend/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (flutterVersionName == null) {
2424

2525
android {
2626
namespace "com.capstone.frontend"
27-
compileSdk flutter.compileSdkVersion
27+
compileSdk 34
2828
ndkVersion flutter.ndkVersion
2929

3030
compileOptions {
@@ -45,7 +45,7 @@ android {
4545
applicationId "com.capstone.frontend"
4646
// You can update the following values to match your application needs.
4747
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
48-
minSdkVersion flutter.minSdkVersion
48+
minSdkVersion 23
4949
targetSdkVersion flutter.targetSdkVersion
5050
versionCode flutterVersionCode.toInteger()
5151
versionName flutterVersionName

‎frontend/ios/Flutter/Debug.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "Generated.xcconfig"

‎frontend/ios/Flutter/Release.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "Generated.xcconfig"

‎frontend/ios/Podfile

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Uncomment this line to define a global platform for your project
2+
# platform :ios, '12.0'
3+
4+
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
5+
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
6+
7+
project 'Runner', {
8+
'Debug' => :debug,
9+
'Profile' => :release,
10+
'Release' => :release,
11+
}
12+
13+
def flutter_root
14+
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
15+
unless File.exist?(generated_xcode_build_settings_path)
16+
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
17+
end
18+
19+
File.foreach(generated_xcode_build_settings_path) do |line|
20+
matches = line.match(/FLUTTER_ROOT\=(.*)/)
21+
return matches[1].strip if matches
22+
end
23+
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
24+
end
25+
26+
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
27+
28+
flutter_ios_podfile_setup
29+
30+
target 'Runner' do
31+
use_frameworks!
32+
use_modular_headers!
33+
34+
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
35+
target 'RunnerTests' do
36+
inherit! :search_paths
37+
end
38+
end
39+
40+
post_install do |installer|
41+
installer.pods_project.targets.each do |target|
42+
flutter_additional_ios_build_settings(target)
43+
end
44+
end

‎frontend/ios/Podfile.lock

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
PODS:
2+
- Flutter (1.0.0)
3+
- flutter_secure_storage (6.0.0):
4+
- Flutter
5+
- path_provider_foundation (0.0.1):
6+
- Flutter
7+
- FlutterMacOS
8+
9+
DEPENDENCIES:
10+
- Flutter (from `Flutter`)
11+
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
12+
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
13+
14+
EXTERNAL SOURCES:
15+
Flutter:
16+
:path: Flutter
17+
flutter_secure_storage:
18+
:path: ".symlinks/plugins/flutter_secure_storage/ios"
19+
path_provider_foundation:
20+
:path: ".symlinks/plugins/path_provider_foundation/darwin"
21+
22+
SPEC CHECKSUMS:
23+
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
24+
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
25+
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
26+
27+
PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
28+
29+
COCOAPODS: 1.15.2

‎frontend/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1515
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1616
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
17+
F17872A61F84019831AA7DF5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B376DD71321D90439FB56E09 /* Pods_Runner.framework */; };
18+
F9E0706160C1A168B4AD8771 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C99F95D609AE710545B87CB0 /* Pods_RunnerTests.framework */; };
1719
/* End PBXBuildFile section */
1820

1921
/* Begin PBXContainerItemProxy section */
@@ -42,9 +44,12 @@
4244
/* Begin PBXFileReference section */
4345
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4446
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
47+
2D6856894CEA93B82307D4F0 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4548
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
4649
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
50+
37A6B50AE4A0C89547F300F5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
4751
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
52+
45B7BBE77D34F5283E2341E8 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
4853
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4954
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5055
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -55,19 +60,56 @@
5560
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5661
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5762
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
63+
B376DD71321D90439FB56E09 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
64+
B7468EB7DEEC854484182F98 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
65+
B9148A24F1DCE0A1B580BB6D /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
66+
C39FF63A62665EE07D5C7752 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
67+
C99F95D609AE710545B87CB0 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5868
/* End PBXFileReference section */
5969

6070
/* Begin PBXFrameworksBuildPhase section */
71+
5CB2F07B74F72FE63306D4C2 /* Frameworks */ = {
72+
isa = PBXFrameworksBuildPhase;
73+
buildActionMask = 2147483647;
74+
files = (
75+
F9E0706160C1A168B4AD8771 /* Pods_RunnerTests.framework in Frameworks */,
76+
);
77+
runOnlyForDeploymentPostprocessing = 0;
78+
};
6179
97C146EB1CF9000F007C117D /* Frameworks */ = {
6280
isa = PBXFrameworksBuildPhase;
6381
buildActionMask = 2147483647;
6482
files = (
83+
F17872A61F84019831AA7DF5 /* Pods_Runner.framework in Frameworks */,
6584
);
6685
runOnlyForDeploymentPostprocessing = 0;
6786
};
6887
/* End PBXFrameworksBuildPhase section */
6988

7089
/* Begin PBXGroup section */
90+
0FFD0CDCD0ED4857B8A222BF /* Frameworks */ = {
91+
isa = PBXGroup;
92+
children = (
93+
B376DD71321D90439FB56E09 /* Pods_Runner.framework */,
94+
C99F95D609AE710545B87CB0 /* Pods_RunnerTests.framework */,
95+
);
96+
name = Frameworks;
97+
sourceTree = "<group>";
98+
};
99+
1C13BAA2FC2DAFB3A99F21AD /* Pods */ = {
100+
isa = PBXGroup;
101+
children = (
102+
2D6856894CEA93B82307D4F0 /* Pods-Runner.debug.xcconfig */,
103+
C39FF63A62665EE07D5C7752 /* Pods-Runner.release.xcconfig */,
104+
45B7BBE77D34F5283E2341E8 /* Pods-Runner.profile.xcconfig */,
105+
B9148A24F1DCE0A1B580BB6D /* Pods-RunnerTests.debug.xcconfig */,
106+
37A6B50AE4A0C89547F300F5 /* Pods-RunnerTests.release.xcconfig */,
107+
B7468EB7DEEC854484182F98 /* Pods-RunnerTests.profile.xcconfig */,
108+
);
109+
name = Pods;
110+
path = Pods;
111+
sourceTree = "<group>";
112+
};
71113
331C8082294A63A400263BE5 /* RunnerTests */ = {
72114
isa = PBXGroup;
73115
children = (
@@ -94,6 +136,8 @@
94136
97C146F01CF9000F007C117D /* Runner */,
95137
97C146EF1CF9000F007C117D /* Products */,
96138
331C8082294A63A400263BE5 /* RunnerTests */,
139+
1C13BAA2FC2DAFB3A99F21AD /* Pods */,
140+
0FFD0CDCD0ED4857B8A222BF /* Frameworks */,
97141
);
98142
sourceTree = "<group>";
99143
};
@@ -128,8 +172,10 @@
128172
isa = PBXNativeTarget;
129173
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
130174
buildPhases = (
175+
7C9DF485007BA0B9F971C22D /* [CP] Check Pods Manifest.lock */,
131176
331C807D294A63A400263BE5 /* Sources */,
132177
331C807F294A63A400263BE5 /* Resources */,
178+
5CB2F07B74F72FE63306D4C2 /* Frameworks */,
133179
);
134180
buildRules = (
135181
);
@@ -145,12 +191,14 @@
145191
isa = PBXNativeTarget;
146192
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
147193
buildPhases = (
194+
20CBE0EE0E4508EB4A625781 /* [CP] Check Pods Manifest.lock */,
148195
9740EEB61CF901F6004384FC /* Run Script */,
149196
97C146EA1CF9000F007C117D /* Sources */,
150197
97C146EB1CF9000F007C117D /* Frameworks */,
151198
97C146EC1CF9000F007C117D /* Resources */,
152199
9705A1C41CF9048500538489 /* Embed Frameworks */,
153200
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
201+
77BB807051C995C1F224FE77 /* [CP] Embed Pods Frameworks */,
154202
);
155203
buildRules = (
156204
);
@@ -222,6 +270,28 @@
222270
/* End PBXResourcesBuildPhase section */
223271

224272
/* Begin PBXShellScriptBuildPhase section */
273+
20CBE0EE0E4508EB4A625781 /* [CP] Check Pods Manifest.lock */ = {
274+
isa = PBXShellScriptBuildPhase;
275+
buildActionMask = 2147483647;
276+
files = (
277+
);
278+
inputFileListPaths = (
279+
);
280+
inputPaths = (
281+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
282+
"${PODS_ROOT}/Manifest.lock",
283+
);
284+
name = "[CP] Check Pods Manifest.lock";
285+
outputFileListPaths = (
286+
);
287+
outputPaths = (
288+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
289+
);
290+
runOnlyForDeploymentPostprocessing = 0;
291+
shellPath = /bin/sh;
292+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
293+
showEnvVarsInLog = 0;
294+
};
225295
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
226296
isa = PBXShellScriptBuildPhase;
227297
alwaysOutOfDate = 1;
@@ -238,6 +308,45 @@
238308
shellPath = /bin/sh;
239309
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
240310
};
311+
77BB807051C995C1F224FE77 /* [CP] Embed Pods Frameworks */ = {
312+
isa = PBXShellScriptBuildPhase;
313+
buildActionMask = 2147483647;
314+
files = (
315+
);
316+
inputFileListPaths = (
317+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
318+
);
319+
name = "[CP] Embed Pods Frameworks";
320+
outputFileListPaths = (
321+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
322+
);
323+
runOnlyForDeploymentPostprocessing = 0;
324+
shellPath = /bin/sh;
325+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
326+
showEnvVarsInLog = 0;
327+
};
328+
7C9DF485007BA0B9F971C22D /* [CP] Check Pods Manifest.lock */ = {
329+
isa = PBXShellScriptBuildPhase;
330+
buildActionMask = 2147483647;
331+
files = (
332+
);
333+
inputFileListPaths = (
334+
);
335+
inputPaths = (
336+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
337+
"${PODS_ROOT}/Manifest.lock",
338+
);
339+
name = "[CP] Check Pods Manifest.lock";
340+
outputFileListPaths = (
341+
);
342+
outputPaths = (
343+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
344+
);
345+
runOnlyForDeploymentPostprocessing = 0;
346+
shellPath = /bin/sh;
347+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
348+
showEnvVarsInLog = 0;
349+
};
241350
9740EEB61CF901F6004384FC /* Run Script */ = {
242351
isa = PBXShellScriptBuildPhase;
243352
alwaysOutOfDate = 1;
@@ -378,6 +487,7 @@
378487
};
379488
331C8088294A63A400263BE5 /* Debug */ = {
380489
isa = XCBuildConfiguration;
490+
baseConfigurationReference = B9148A24F1DCE0A1B580BB6D /* Pods-RunnerTests.debug.xcconfig */;
381491
buildSettings = {
382492
BUNDLE_LOADER = "$(TEST_HOST)";
383493
CODE_SIGN_STYLE = Automatic;
@@ -395,6 +505,7 @@
395505
};
396506
331C8089294A63A400263BE5 /* Release */ = {
397507
isa = XCBuildConfiguration;
508+
baseConfigurationReference = 37A6B50AE4A0C89547F300F5 /* Pods-RunnerTests.release.xcconfig */;
398509
buildSettings = {
399510
BUNDLE_LOADER = "$(TEST_HOST)";
400511
CODE_SIGN_STYLE = Automatic;
@@ -410,6 +521,7 @@
410521
};
411522
331C808A294A63A400263BE5 /* Profile */ = {
412523
isa = XCBuildConfiguration;
524+
baseConfigurationReference = B7468EB7DEEC854484182F98 /* Pods-RunnerTests.profile.xcconfig */;
413525
buildSettings = {
414526
BUNDLE_LOADER = "$(TEST_HOST)";
415527
CODE_SIGN_STYLE = Automatic;

‎frontend/ios/Runner.xcworkspace/contents.xcworkspacedata

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

0 commit comments

Comments
 (0)