Skip to content

Commit deca39e

Browse files
authored
Merge pull request #566 from charafau/fix_master
Fix master branch
2 parents 298870a + 32384ab commit deca39e

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ example/ios/Podfile.lock
1414
**/Flutter/Flutter.framework/
1515
**/Flutter/Generated.xcconfig/
1616
**/Flutter/flutter_assets/
17-
17+
flutter_export_environment.sh

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1110
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1211
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1312
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1413
945777F11EF64758001C8557 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 945777F01EF64758001C8557 /* GeneratedPluginRegistrant.m */; };
1514
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
16-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1715
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1816
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
1917
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
@@ -32,15 +30,15 @@
3230
dstSubfolderSpec = 10;
3331
files = (
3432
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
35-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3633
);
3734
name = "Embed Frameworks";
3835
runOnlyForDeploymentPostprocessing = 0;
3936
};
4037
/* End PBXCopyFilesBuildPhase section */
4138

4239
/* Begin PBXFileReference section */
43-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
40+
24E8D05517AF08B6C698879C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
41+
2E218F99AE7B8D5BDA44909D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4442
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4543
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4644
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -77,6 +75,8 @@
7775
840012C8B5EDBCF56B0E4AC1 /* Pods */ = {
7876
isa = PBXGroup;
7977
children = (
78+
24E8D05517AF08B6C698879C /* Pods-Runner.debug.xcconfig */,
79+
2E218F99AE7B8D5BDA44909D /* Pods-Runner.release.xcconfig */,
8080
);
8181
name = Pods;
8282
sourceTree = "<group>";
@@ -86,7 +86,6 @@
8686
children = (
8787
3B80C3931E831B6300D905FE /* App.framework */,
8888
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
89-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9089
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9190
9740EEB21CF90195004384FC /* Debug.xcconfig */,
9291
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -190,6 +189,7 @@
190189
developmentRegion = English;
191190
hasScannedForEncodings = 0;
192191
knownRegions = (
192+
English,
193193
en,
194194
Base,
195195
);
@@ -211,7 +211,6 @@
211211
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
212212
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
213213
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
214-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
215214
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
216215
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
217216
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
@@ -241,7 +240,7 @@
241240
files = (
242241
);
243242
inputPaths = (
244-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
243+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
245244
"${PODS_ROOT}/../../../../../flutter/bin/cache/artifacts/engine/ios/Flutter.framework",
246245
"${BUILT_PRODUCTS_DIR}/flutter_webview_plugin/flutter_webview_plugin.framework",
247246
);
@@ -252,7 +251,7 @@
252251
);
253252
runOnlyForDeploymentPostprocessing = 0;
254253
shellPath = /bin/sh;
255-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
254+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
256255
showEnvVarsInLog = 0;
257256
};
258257
9740EEB61CF901F6004384FC /* Run Script */ = {

0 commit comments

Comments
 (0)