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
e6d94ee4
Unverified
Commit
e6d94ee4
authored
Aug 07, 2019
by
jmagman
Committed by
GitHub
Aug 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use relative paths when installing module pods (#37738)
parent
4f302dc1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
7 deletions
+18
-7
podhelper.rb.tmpl
...mplates/module/ios/library/Flutter.tmpl/podhelper.rb.tmpl
+18
-7
No files found.
packages/flutter_tools/templates/module/ios/library/Flutter.tmpl/podhelper.rb.tmpl
View file @
e6d94ee4
...
@@ -32,7 +32,13 @@ def install_flutter_engine_pod
...
@@ -32,7 +32,13 @@ def install_flutter_engine_pod
FileUtils.cp(File.join(debug_framework_dir, 'Flutter.podspec'), engine_dir)
FileUtils.cp(File.join(debug_framework_dir, 'Flutter.podspec'), engine_dir)
end
end
pod 'Flutter', :path => engine_dir, :inhibit_warnings => true
# Keep pod path relative so it can be checked into Podfile.lock.
# Process will be run from project directory.
engine_pathname = Pathname.new engine_dir
project_directory_pathname = Pathname.new Dir.pwd
relative = engine_pathname.relative_path_from project_directory_pathname
pod 'Flutter', :path => relative.to_s, :inhibit_warnings => true
end
end
# Install Flutter plugin pods.
# Install Flutter plugin pods.
...
@@ -46,9 +52,15 @@ end
...
@@ -46,9 +52,15 @@ end
# MyApp/my_flutter/.ios/Flutter/../..
# MyApp/my_flutter/.ios/Flutter/../..
def install_flutter_plugin_pods(flutter_application_path)
def install_flutter_plugin_pods(flutter_application_path)
flutter_application_path ||= File.join('..', '..')
flutter_application_path ||= File.join('..', '..')
pod 'FlutterPluginRegistrant', :path => File.join(__dir__, 'FlutterPluginRegistrant'), :inhibit_warnings => true
symlinks_dir = File.join(__dir__, '.symlinks')
# Keep pod path relative so it can be checked into Podfile.lock.
# Process will be run from project directory.
current_directory_pathname = Pathname.new __dir__
project_directory_pathname = Pathname.new Dir.pwd
relative = current_directory_pathname.relative_path_from project_directory_pathname
pod 'FlutterPluginRegistrant', :path => File.join(relative, 'FlutterPluginRegistrant'), :inhibit_warnings => true
symlinks_dir = File.join(relative, '.symlinks')
FileUtils.mkdir_p(symlinks_dir)
FileUtils.mkdir_p(symlinks_dir)
plugin_pods = parse_KV_file(File.join(flutter_application_path, '.flutter-plugins'))
plugin_pods = parse_KV_file(File.join(flutter_application_path, '.flutter-plugins'))
plugin_pods.map do |r|
plugin_pods.map do |r|
...
@@ -79,13 +91,12 @@ def install_flutter_application_pod(flutter_application_path)
...
@@ -79,13 +91,12 @@ def install_flutter_application_pod(flutter_application_path)
`echo "static const int Moo = 88;" | xcrun clang -x c -dynamiclib -o "#{app_framework_dylib}" -`
`echo "static const int Moo = 88;" | xcrun clang -x c -dynamiclib -o "#{app_framework_dylib}" -`
end
end
pod '{{projectName}}', :path => __dir__, :inhibit_warnings => true
# Keep pod and script phase paths relative so they can be checked into source control.
# Use relative paths for script phase paths since these strings will likely be checked into source controls.
# Process will be run from project directory.
# Process will be run from project directory.
current_directory_pathname = Pathname.new __dir__
.to_s
current_directory_pathname = Pathname.new __dir__
project_directory_pathname = Pathname.new Dir.pwd
project_directory_pathname = Pathname.new Dir.pwd
relative = current_directory_pathname.relative_path_from project_directory_pathname
relative = current_directory_pathname.relative_path_from project_directory_pathname
pod '{{projectName}}', :path => relative.to_s, :inhibit_warnings => true
flutter_export_environment_path = File.join('${SRCROOT}', relative, 'flutter_export_environment.sh');
flutter_export_environment_path = File.join('${SRCROOT}', relative, 'flutter_export_environment.sh');
script_phase :name => 'Run Flutter Build Script',
script_phase :name => 'Run Flutter Build Script',
...
...
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