Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
6b2ef0df
Unverified
Commit
6b2ef0df
authored
Aug 12, 2020
by
Jenn Magder
Committed by
GitHub
Aug 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix App.framework path in Podfile (#63412)
parent
2384376f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
2 deletions
+30
-2
module_test_ios.dart
dev/devicelab/bin/tasks/module_test_ios.dart
+27
-0
podhelper.rb.tmpl
...mplates/module/ios/library/Flutter.tmpl/podhelper.rb.tmpl
+3
-2
No files found.
dev/devicelab/bin/tasks/module_test_ios.dart
View file @
6b2ef0df
...
...
@@ -191,6 +191,16 @@ Future<void> main() async {
// Android-only, no embedded framework.
checkDirectoryNotExists
(
path
.
join
(
ephemeralIOSHostApp
.
path
,
'Frameworks'
,
'android_alarm_manager.framework'
));
section
(
'Clean and pub get module'
);
await
inDirectory
(
projectDir
,
()
async
{
await
flutter
(
'clean'
);
});
await
inDirectory
(
projectDir
,
()
async
{
await
flutter
(
'pub'
,
options:
<
String
>[
'get'
]);
});
section
(
'Add to existing iOS Objective-C app'
);
final
Directory
objectiveCHostApp
=
Directory
(
path
.
join
(
tempDir
.
path
,
'hello_host_app'
));
...
...
@@ -241,6 +251,23 @@ Future<void> main() async {
return
TaskResult
.
failure
(
'Failed to build existing Objective-C app .app'
);
}
checkFileExists
(
path
.
join
(
objectiveCBuildDirectory
.
path
,
'Host.app'
,
'Frameworks'
,
'Flutter.framework'
,
'Flutter'
,
));
checkFileExists
(
path
.
join
(
objectiveCBuildDirectory
.
path
,
'Host.app'
,
'Frameworks'
,
'App.framework'
,
'flutter_assets'
,
'isolate_snapshot_data'
,
));
final
String
objectiveCAnalyticsOutput
=
objectiveCAnalyticsOutputFile
.
readAsStringSync
();
if
(!
objectiveCAnalyticsOutput
.
contains
(
'cd24: ios'
)
||
!
objectiveCAnalyticsOutput
.
contains
(
'cd25: true'
)
...
...
packages/flutter_tools/templates/module/ios/library/Flutter.tmpl/podhelper.rb.tmpl
View file @
6b2ef0df
...
...
@@ -96,7 +96,8 @@ end
# Optional, defaults to two levels up from the directory of this script.
# MyApp/my_flutter/.ios/Flutter/../..
def install_flutter_application_pod(flutter_application_path)
app_framework_dir = File.expand_path('App.framework', File.join('..', __FILE__))
current_directory_pathname = Pathname.new File.expand_path('..', __FILE__)
app_framework_dir = File.expand_path('App.framework', current_directory_pathname.to_path)
app_framework_dylib = File.join(app_framework_dir, 'App')
if !File.exist?(app_framework_dylib)
# Fake an App.framework to have something to link against if the xcode backend script has not run yet.
...
...
@@ -108,7 +109,7 @@ def install_flutter_application_pod(flutter_application_path)
# Keep pod and script phase paths relative so they can be checked into source control.
# Process will be run from project directory.
current_directory_pathname = Pathname.new File.expand_path('..', __FILE__)
# defined_in_file is set by CocoaPods and is a Pathname to the Podfile.
project_directory_pathname = defined_in_file.dirname
relative = current_directory_pathname.relative_path_from project_directory_pathname
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment