Skip to content

Commit 5c24a75

Browse files
loic-sharmaericwindmill
loic-sharma
and
ericwindmill
authored
Fix the ios_fullscreen app (#2817)
Fixes the ios_fullscreen add-to-app sample app: 1. The Flutter module was renamed from `flutter_module` to `flutter_module_fullscreen`. However, the iOS native app had not been updated to reflect this 2. Flutter's minimum deployment version was raised to 13.0. The iOS native app targeted iOS 12.4. ## Pre-launch Checklist - [x] I read the [Flutter Style Guide] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I read the [Contributors Guide]. - [ ] I have added sample code updates to the [changelog]. - [x] I updated/added relevant documentation (doc comments with `///`). If you need help, consider asking for advice on the #hackers-devrel channel on [Discord]. <!-- Links --> [Flutter Style Guide]: https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md [CLA]: https://cla.developers.google.com/ [Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md [Contributors Guide]: https://github.com/flutter/samples/blob/main/CONTRIBUTING.md [changelog]: ../CHANGELOG.md Co-authored-by: Eric Windmill <eric@ericwindmill.com>
1 parent e1f4b30 commit 5c24a75

5 files changed

Lines changed: 23 additions & 28 deletions

File tree

‎add_to_app/fullscreen/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Embeds a full screen instance of Flutter into an existing iOS or Android app.
55
## Description
66

77
These apps showcase a relatively straightforward integration of
8-
`flutter_module`:
8+
`flutter_module_fullscreen`:
99

1010
* The Flutter module is built along with the app when the app is built.
1111
* The Flutter engine is warmed up at app launch.
@@ -27,7 +27,7 @@ you're building for both iOS and Android, with both toolchains installed):
2727
#!/bin/bash
2828
set -e
2929

30-
cd flutter_module/
30+
cd flutter_module_fullscreen/
3131
flutter pub get
3232

3333
# For Android builds:

‎add_to_app/fullscreen/android_fullscreen/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ rootProject.name='AndroidFullScreen'
33
setBinding(new Binding([gradle: this]))
44
evaluate(new File(
55
settingsDir.parentFile,
6-
'flutter_module/.android/include_flutter.groovy'
6+
'flutter_module_fullscreen/.android/include_flutter.groovy'
77
))

‎add_to_app/fullscreen/flutter_module_fullscreen/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# flutter_module
1+
# flutter_module_fullscreen
22

33
An example Flutter module used in the Flutter add-to-app samples. For more
44
information on how to use it, see the [README.md](../README.md) parent

‎add_to_app/fullscreen/ios_fullscreen/IOSFullScreen.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -175,11 +175,11 @@
175175
buildConfigurationList = 26DF66FC233136470076ACA6 /* Build configuration list for PBXNativeTarget "IOSFullScreen" */;
176176
buildPhases = (
177177
9AB0355F19DEFA7A4ECCC777 /* [CP] Check Pods Manifest.lock */,
178-
79D4306CA9A49DFDB68D2B71 /* [CP-User] Run Flutter Build flutter_module Script */,
178+
79D4306CA9A49DFDB68D2B71 /* [CP-User] Run Flutter Build flutter_module_fullscreen Script */,
179179
26DF66D0233136460076ACA6 /* Sources */,
180180
26DF66D1233136460076ACA6 /* Frameworks */,
181181
26DF66D2233136460076ACA6 /* Resources */,
182-
D1C2795C35803D65EBC8B371 /* [CP] Embed Pods Frameworks */,
182+
B9B95ECDA31F21359E3D008B /* [CP-User] Embed Flutter Build flutter_module_fullscreen Script */,
183183
);
184184
buildRules = (
185185
);
@@ -321,15 +321,15 @@
321321
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";
322322
showEnvVarsInLog = 0;
323323
};
324-
79D4306CA9A49DFDB68D2B71 /* [CP-User] Run Flutter Build flutter_module Script */ = {
324+
79D4306CA9A49DFDB68D2B71 /* [CP-User] Run Flutter Build flutter_module_fullscreen Script */ = {
325325
isa = PBXShellScriptBuildPhase;
326326
buildActionMask = 2147483647;
327327
files = (
328328
);
329-
name = "[CP-User] Run Flutter Build flutter_module Script";
329+
name = "[CP-User] Run Flutter Build flutter_module_fullscreen Script";
330330
runOnlyForDeploymentPostprocessing = 0;
331331
shellPath = /bin/sh;
332-
shellScript = "set -e\nset -u\nsource \"${SRCROOT}/../flutter_module/.ios/Flutter/flutter_export_environment.sh\"\nexport VERBOSE_SCRIPT_LOGGING=1 && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build";
332+
shellScript = "set -e\nset -u\nsource \"${SRCROOT}/../flutter_module_fullscreen/.ios/Flutter/flutter_export_environment.sh\"\nexport VERBOSE_SCRIPT_LOGGING=1 && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build";
333333
};
334334
9AB0355F19DEFA7A4ECCC777 /* [CP] Check Pods Manifest.lock */ = {
335335
isa = PBXShellScriptBuildPhase;
@@ -353,6 +353,16 @@
353353
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";
354354
showEnvVarsInLog = 0;
355355
};
356+
B9B95ECDA31F21359E3D008B /* [CP-User] Embed Flutter Build flutter_module_fullscreen Script */ = {
357+
isa = PBXShellScriptBuildPhase;
358+
buildActionMask = 2147483647;
359+
files = (
360+
);
361+
name = "[CP-User] Embed Flutter Build flutter_module_fullscreen Script";
362+
runOnlyForDeploymentPostprocessing = 0;
363+
shellPath = /bin/sh;
364+
shellScript = "set -e\nset -u\nsource \"${SRCROOT}/../flutter_module_fullscreen/.ios/Flutter/flutter_export_environment.sh\"\nexport VERBOSE_SCRIPT_LOGGING=1 && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh embed_and_thin";
365+
};
356366
C73209EF6AC199B8584ED9E2 /* [CP] Check Pods Manifest.lock */ = {
357367
isa = PBXShellScriptBuildPhase;
358368
buildActionMask = 2147483647;
@@ -375,23 +385,6 @@
375385
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";
376386
showEnvVarsInLog = 0;
377387
};
378-
D1C2795C35803D65EBC8B371 /* [CP] Embed Pods Frameworks */ = {
379-
isa = PBXShellScriptBuildPhase;
380-
buildActionMask = 2147483647;
381-
files = (
382-
);
383-
inputFileListPaths = (
384-
"${PODS_ROOT}/Target Support Files/Pods-IOSFullScreen/Pods-IOSFullScreen-frameworks-${CONFIGURATION}-input-files.xcfilelist",
385-
);
386-
name = "[CP] Embed Pods Frameworks";
387-
outputFileListPaths = (
388-
"${PODS_ROOT}/Target Support Files/Pods-IOSFullScreen/Pods-IOSFullScreen-frameworks-${CONFIGURATION}-output-files.xcfilelist",
389-
);
390-
runOnlyForDeploymentPostprocessing = 0;
391-
shellPath = /bin/sh;
392-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-IOSFullScreen/Pods-IOSFullScreen-frameworks.sh\"\n";
393-
showEnvVarsInLog = 0;
394-
};
395388
/* End PBXShellScriptBuildPhase section */
396389

397390
/* Begin PBXSourcesBuildPhase section */
@@ -578,6 +571,7 @@
578571
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
579572
CODE_SIGN_STYLE = Automatic;
580573
INFOPLIST_FILE = "IOSFullScreen/Info-$(CONFIGURATION).plist";
574+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
581575
LD_RUNPATH_SEARCH_PATHS = (
582576
"$(inherited)",
583577
"@executable_path/Frameworks",
@@ -596,6 +590,7 @@
596590
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
597591
CODE_SIGN_STYLE = Automatic;
598592
INFOPLIST_FILE = "IOSFullScreen/Info-$(CONFIGURATION).plist";
593+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
599594
LD_RUNPATH_SEARCH_PATHS = (
600595
"$(inherited)",
601596
"@executable_path/Frameworks",

‎add_to_app/fullscreen/ios_fullscreen/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Uncomment the next line to define a global platform for your project
22
# platform :ios, '9.0'
33

4-
flutter_application_path = '../flutter_module'
4+
flutter_application_path = '../flutter_module_fullscreen'
55
load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
66

77
target 'IOSFullScreen' do

0 commit comments

Comments
 (0)