Skip to content

Commit dcf7a86

Browse files
szakariasszakarias
authored
Remove app.flx reference in ios example apps (flutter#489)
1 parent 7c3a2f3 commit dcf7a86

File tree

7 files changed

+63
-41
lines changed

7 files changed

+63
-41
lines changed

‎packages/firebase_admob/example/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
.pub/
77
build/
88
ios/.generated/
9-
ios/Flutter/app.flx
109
packages
1110
pubspec.lock

‎packages/google_mobile_maps/example/ios/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ xcuserdata
3131
Icon?
3232
.tags*
3333

34-
/Flutter/app.flx
3534
/Flutter/app.zip
3635
/Flutter/flutter_assets/
3736
/Flutter/App.framework

‎packages/google_sign_in/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1818
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1919
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
20-
9740EEBB1CF902C7004384FC /* app.flx in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB71CF902C7004384FC /* app.flx */; };
2120
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2221
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2322
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
2423
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
2524
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
26-
C16B660CC74FAEC583237BE3 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E788135933A58DA16E5983F /* libPods-Runner.a */; };
25+
E5E7806EBADAAA76616C79F9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 022A9EFBF482CDFB30AF7651 /* Pods_Runner.framework */; };
2726
/* End PBXBuildFile section */
2827

2928
/* Begin PBXCopyFilesBuildPhase section */
@@ -42,8 +41,8 @@
4241
/* End PBXCopyFilesBuildPhase section */
4342

4443
/* Begin PBXFileReference section */
44+
022A9EFBF482CDFB30AF7651 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4545
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
46-
2E788135933A58DA16E5983F /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4746
5C6F5A6C1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4847
5C6F5A6D1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4948
7A303C2D1E89D76400B1F19E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -54,7 +53,6 @@
5453
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
5554
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5655
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
57-
9740EEB71CF902C7004384FC /* app.flx */ = {isa = PBXFileReference; lastKnownFileType = file; name = app.flx; path = Flutter/app.flx; sourceTree = "<group>"; };
5856
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
5957
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
6058
97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -71,7 +69,7 @@
7169
files = (
7270
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
7371
7ACDFB091E89442200BE2D00 /* App.framework in Frameworks */,
74-
C16B660CC74FAEC583237BE3 /* libPods-Runner.a in Frameworks */,
72+
E5E7806EBADAAA76616C79F9 /* Pods_Runner.framework in Frameworks */,
7573
);
7674
runOnlyForDeploymentPostprocessing = 0;
7775
};
@@ -90,7 +88,6 @@
9088
children = (
9189
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9290
7ACDFB0D1E8944C400BE2D00 /* AppFrameworkInfo.plist */,
93-
9740EEB71CF902C7004384FC /* app.flx */,
9491
7ACDFB081E89442200BE2D00 /* App.framework */,
9592
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9693
9740EEB21CF90195004384FC /* Debug.xcconfig */,
@@ -147,7 +144,7 @@
147144
CF3B75C9A7D2FA2A4C99F110 /* Frameworks */ = {
148145
isa = PBXGroup;
149146
children = (
150-
2E788135933A58DA16E5983F /* libPods-Runner.a */,
147+
022A9EFBF482CDFB30AF7651 /* Pods_Runner.framework */,
151148
);
152149
name = Frameworks;
153150
sourceTree = "<group>";
@@ -217,7 +214,6 @@
217214
files = (
218215
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
219216
7A303C2E1E89D76400B1F19E /* GoogleService-Info.plist in Resources */,
220-
9740EEBB1CF902C7004384FC /* app.flx in Resources */,
221217
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
222218
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
223219
7ACDFB0E1E8944C400BE2D00 /* AppFrameworkInfo.plist in Resources */,
@@ -251,12 +247,10 @@
251247
);
252248
inputPaths = (
253249
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
254-
"${PODS_ROOT}/GTMOAuth2/Source/Touch/GTMOAuth2ViewTouch.xib",
255250
"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
256251
);
257252
name = "[CP] Copy Pods Resources";
258253
outputPaths = (
259-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMOAuth2ViewTouch.nib",
260254
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
261255
);
262256
runOnlyForDeploymentPostprocessing = 0;
@@ -271,11 +265,17 @@
271265
);
272266
inputPaths = (
273267
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
274-
"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
268+
"${PODS_ROOT}/../../../../../../flutter/bin/cache/artifacts/engine/ios-release/Flutter.framework",
269+
"${BUILT_PRODUCTS_DIR}/GTMOAuth2/GTMOAuth2.framework",
270+
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
271+
"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
275272
);
276273
name = "[CP] Embed Pods Frameworks";
277274
outputPaths = (
278275
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
276+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMOAuth2.framework",
277+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
278+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
279279
);
280280
runOnlyForDeploymentPostprocessing = 0;
281281
shellPath = /bin/sh;

‎packages/quick_actions/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1213
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1314
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -16,7 +17,6 @@
1617
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1718
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1819
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
19-
9740EEBB1CF902C7004384FC /* app.flx in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB71CF902C7004384FC /* app.flx */; };
2020
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2121
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2222
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -42,14 +42,14 @@
4242
/* Begin PBXFileReference section */
4343
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4444
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
45+
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4546
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4647
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4748
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4849
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4950
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
5051
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5152
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
52-
9740EEB71CF902C7004384FC /* app.flx */ = {isa = PBXFileReference; lastKnownFileType = file; name = app.flx; path = Flutter/app.flx; sourceTree = "<group>"; };
5353
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
5454
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5555
97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -77,9 +77,9 @@
7777
9740EEB11CF90186004384FC /* Flutter */ = {
7878
isa = PBXGroup;
7979
children = (
80-
9740EEB71CF902C7004384FC /* app.flx */,
8180
3B80C3931E831B6300D905FE /* App.framework */,
8281
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
82+
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
8383
9740EEBA1CF902C7004384FC /* Flutter.framework */,
8484
9740EEB21CF90195004384FC /* Debug.xcconfig */,
8585
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -210,10 +210,10 @@
210210
isa = PBXResourcesBuildPhase;
211211
buildActionMask = 2147483647;
212212
files = (
213-
9740EEBB1CF902C7004384FC /* app.flx in Resources */,
214213
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
215214
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
216215
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
216+
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
217217
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
218218
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
219219
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
@@ -272,13 +272,16 @@
272272
files = (
273273
);
274274
inputPaths = (
275+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
276+
"${PODS_ROOT}/Manifest.lock",
275277
);
276278
name = "[CP] Check Pods Manifest.lock";
277279
outputPaths = (
280+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
278281
);
279282
runOnlyForDeploymentPostprocessing = 0;
280283
shellPath = /bin/sh;
281-
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";
284+
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";
282285
showEnvVarsInLog = 0;
283286
};
284287
FEDDF02AA7C2BA0D1905BD95 /* [CP] Embed Pods Frameworks */ = {
@@ -287,9 +290,12 @@
287290
files = (
288291
);
289292
inputPaths = (
293+
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
294+
"${PODS_ROOT}/.symlinks/flutter/ios/Flutter.framework",
290295
);
291296
name = "[CP] Embed Pods Frameworks";
292297
outputPaths = (
298+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
293299
);
294300
runOnlyForDeploymentPostprocessing = 0;
295301
shellPath = /bin/sh;

0 commit comments

Comments
 (0)