Skip to content

Commit f9dea43

Browse files
Khaoz-TopsyKhaoz-Topsy
committed
Merge branch 'develop' of https://github.com/AssistantNMS/App into develop
2 parents 16c66ba + d973a88 commit f9dea43

3 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
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-
C6E9AA1F559736586F804B8E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA669A135833A62A3FC9F5D /* Pods_Runner.framework */; };
17+
C6615D347CD6C713B08944AB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF4315C11011951D4337F101 /* Pods_Runner.framework */; };
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXCopyFilesBuildPhase section */
@@ -31,14 +31,13 @@
3131
/* End PBXCopyFilesBuildPhase section */
3232

3333
/* Begin PBXFileReference section */
34-
0DAAE8480C6526A0AAD64F24 /* 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>"; };
3534
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3635
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3736
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
38-
3EA669A135833A62A3FC9F5D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
39-
4D86F262B19AC459F1A62735 /* 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>"; };
37+
6A009EABB5EBC045D34CD965 /* 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>"; };
4038
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4139
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
40+
78D907CFDDE89F8127BCB3F8 /* 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>"; };
4241
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4342
89001211235F7F6B002F7BA0 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
4443
89001213235F890E002F7BA0 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
@@ -49,29 +48,22 @@
4948
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5049
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5150
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
52-
9B5128521343080591F6F49B /* 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>"; };
51+
BB521D5A606644931AC7F10C /* 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>"; };
52+
BF4315C11011951D4337F101 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5353
/* End PBXFileReference section */
5454

5555
/* Begin PBXFrameworksBuildPhase section */
5656
97C146EB1CF9000F007C117D /* Frameworks */ = {
5757
isa = PBXFrameworksBuildPhase;
5858
buildActionMask = 2147483647;
5959
files = (
60-
C6E9AA1F559736586F804B8E /* Pods_Runner.framework in Frameworks */,
60+
C6615D347CD6C713B08944AB /* Pods_Runner.framework in Frameworks */,
6161
);
6262
runOnlyForDeploymentPostprocessing = 0;
6363
};
6464
/* End PBXFrameworksBuildPhase section */
6565

6666
/* Begin PBXGroup section */
67-
408852665ED73DFAE310EAC2 /* Frameworks */ = {
68-
isa = PBXGroup;
69-
children = (
70-
3EA669A135833A62A3FC9F5D /* Pods_Runner.framework */,
71-
);
72-
name = Frameworks;
73-
sourceTree = "<group>";
74-
};
7567
9740EEB11CF90186004384FC /* Flutter */ = {
7668
isa = PBXGroup;
7769
children = (
@@ -90,7 +82,7 @@
9082
97C146F01CF9000F007C117D /* Runner */,
9183
97C146EF1CF9000F007C117D /* Products */,
9284
AB7322030F8DA0E26149D15A /* Pods */,
93-
408852665ED73DFAE310EAC2 /* Frameworks */,
85+
C68A6D0C5ECCDB0D958395D6 /* Frameworks */,
9486
);
9587
sourceTree = "<group>";
9688
};
@@ -130,28 +122,36 @@
130122
AB7322030F8DA0E26149D15A /* Pods */ = {
131123
isa = PBXGroup;
132124
children = (
133-
4D86F262B19AC459F1A62735 /* Pods-Runner.debug.xcconfig */,
134-
0DAAE8480C6526A0AAD64F24 /* Pods-Runner.release.xcconfig */,
135-
9B5128521343080591F6F49B /* Pods-Runner.profile.xcconfig */,
125+
6A009EABB5EBC045D34CD965 /* Pods-Runner.debug.xcconfig */,
126+
BB521D5A606644931AC7F10C /* Pods-Runner.release.xcconfig */,
127+
78D907CFDDE89F8127BCB3F8 /* Pods-Runner.profile.xcconfig */,
136128
);
137129
path = Pods;
138130
sourceTree = "<group>";
139131
};
132+
C68A6D0C5ECCDB0D958395D6 /* Frameworks */ = {
133+
isa = PBXGroup;
134+
children = (
135+
BF4315C11011951D4337F101 /* Pods_Runner.framework */,
136+
);
137+
name = Frameworks;
138+
sourceTree = "<group>";
139+
};
140140
/* End PBXGroup section */
141141

142142
/* Begin PBXNativeTarget section */
143143
97C146ED1CF9000F007C117D /* Runner */ = {
144144
isa = PBXNativeTarget;
145145
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
146146
buildPhases = (
147-
9CAE3F5C7722147024896B70 /* [CP] Check Pods Manifest.lock */,
147+
AE91A604339142F93618D1F8 /* [CP] Check Pods Manifest.lock */,
148148
9740EEB61CF901F6004384FC /* Run Script */,
149149
97C146EA1CF9000F007C117D /* Sources */,
150150
97C146EB1CF9000F007C117D /* Frameworks */,
151151
97C146EC1CF9000F007C117D /* Resources */,
152152
9705A1C41CF9048500538489 /* Embed Frameworks */,
153153
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
154-
F2BE44783530C7D6D2006289 /* [CP] Embed Pods Frameworks */,
154+
5A01B89E4CCFCE0AC0B1BFF6 /* [CP] Embed Pods Frameworks */,
155155
);
156156
buildRules = (
157157
);
@@ -227,6 +227,23 @@
227227
shellPath = /bin/sh;
228228
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
229229
};
230+
5A01B89E4CCFCE0AC0B1BFF6 /* [CP] Embed Pods Frameworks */ = {
231+
isa = PBXShellScriptBuildPhase;
232+
buildActionMask = 2147483647;
233+
files = (
234+
);
235+
inputFileListPaths = (
236+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
237+
);
238+
name = "[CP] Embed Pods Frameworks";
239+
outputFileListPaths = (
240+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
241+
);
242+
runOnlyForDeploymentPostprocessing = 0;
243+
shellPath = /bin/sh;
244+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
245+
showEnvVarsInLog = 0;
246+
};
230247
9740EEB61CF901F6004384FC /* Run Script */ = {
231248
isa = PBXShellScriptBuildPhase;
232249
buildActionMask = 2147483647;
@@ -241,7 +258,7 @@
241258
shellPath = /bin/sh;
242259
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
243260
};
244-
9CAE3F5C7722147024896B70 /* [CP] Check Pods Manifest.lock */ = {
261+
AE91A604339142F93618D1F8 /* [CP] Check Pods Manifest.lock */ = {
245262
isa = PBXShellScriptBuildPhase;
246263
buildActionMask = 2147483647;
247264
files = (
@@ -263,23 +280,6 @@
263280
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";
264281
showEnvVarsInLog = 0;
265282
};
266-
F2BE44783530C7D6D2006289 /* [CP] Embed Pods Frameworks */ = {
267-
isa = PBXShellScriptBuildPhase;
268-
buildActionMask = 2147483647;
269-
files = (
270-
);
271-
inputFileListPaths = (
272-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
273-
);
274-
name = "[CP] Embed Pods Frameworks";
275-
outputFileListPaths = (
276-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
277-
);
278-
runOnlyForDeploymentPostprocessing = 0;
279-
shellPath = /bin/sh;
280-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
281-
showEnvVarsInLog = 0;
282-
};
283283
/* End PBXShellScriptBuildPhase section */
284284

285285
/* Begin PBXSourcesBuildPhase section */

‎pubspec.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ packages:
7777
name: assets_audio_player
7878
url: "https://pub.dartlang.org"
7979
source: hosted
80-
version: "3.0.5"
80+
version: "3.0.4+3"
8181
assets_audio_player_web:
8282
dependency: transitive
8383
description:

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies:
4141
adaptive_theme: 3.1.1
4242
adaptive_dialog: 1.8.0+1
4343
avatar_glow: 2.0.2
44-
assets_audio_player: 3.0.5
44+
assets_audio_player: 3.0.4+3
4545
# audioplayers: ^1.0.1
4646
# awesome_snackbar_content: ^0.0.5
4747
bitsdojo_window: 0.1.5

0 commit comments

Comments
 (0)