Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit da7d157

Browse files
Fix project issue
1 parent 584a108 commit da7d157

File tree

16 files changed

+402
-228
lines changed

16 files changed

+402
-228
lines changed

‎.flutter-plugins-dependencies

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences_foundation","path":"/Users/afgprogrammer/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.3.4/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"shared_preferences_android","path":"/Users/afgprogrammer/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.1/","native_build":true,"dependencies":[]}],"macos":[{"name":"shared_preferences_foundation","path":"/Users/afgprogrammer/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.3.4/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/afgprogrammer/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/afgprogrammer/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.3.2/","native_build":false,"dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/Users/afgprogrammer/.pub-cache/hosted/pub.dev/path_provider_windows-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/afgprogrammer/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.2/","native_build":false,"dependencies":["path_provider_windows"]}],"web":[{"name":"shared_preferences_web","path":"/Users/afgprogrammer/.pub-cache/hosted/pub.dev/shared_preferences_web-2.2.1/","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2023年12月08日 15:14:33.811227","version":"3.13.6"}

‎ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎ios/Flutter/Flutter.podspec

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#
2+
# This podspec is NOT to be published. It is only used as a local source!
3+
# This is a generated file; do not edit or check into version control.
4+
#
5+
6+
Pod::Spec.new do |s|
7+
s.name = 'Flutter'
8+
s.version = '1.0.0'
9+
s.summary = 'A UI toolkit for beautiful and fast apps.'
10+
s.homepage = 'https://flutter.dev'
11+
s.license = { :type => 'BSD' }
12+
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
13+
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
14+
s.ios.deployment_target = '11.0'
15+
# Framework linking is handled by Flutter tooling, not CocoaPods.
16+
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
17+
s.vendored_frameworks = 'path/to/nothing'
18+
end

‎ios/Podfile

Lines changed: 21 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Using a CDN with CocoaPods 1.7.2 or later can save a lot of time on pod installation, but it's experimental rather than the default.
2-
# source 'https://cdn.cocoapods.org/'
3-
41
# Uncomment this line to define a global platform for your project
5-
# platform :ios, '9.0'
2+
# platform :ios, '11.0'
63

74
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
85
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -13,65 +10,35 @@ project 'Runner', {
1310
'Release' => :release,
1411
}
1512

16-
def parse_KV_file(file, separator='=')
17-
file_abs_path = File.expand_path(file)
18-
if !File.exists? file_abs_path
19-
return [];
13+
def flutter_root
14+
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
15+
unless File.exist?(generated_xcode_build_settings_path)
16+
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
17+
end
18+
19+
File.foreach(generated_xcode_build_settings_path) do |line|
20+
matches = line.match(/FLUTTER_ROOT\=(.*)/)
21+
return matches[1].strip if matches
2022
end
21-
pods_ary = []
22-
skip_line_start_symbols = ["#", "/"]
23-
File.foreach(file_abs_path) { |line|
24-
next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
25-
plugin = line.split(pattern=separator)
26-
if plugin.length == 2
27-
podname = plugin[0].strip()
28-
path = plugin[1].strip()
29-
podpath = File.expand_path("#{path}", file_abs_path)
30-
pods_ary.push({:name => podname, :path => podpath});
31-
else
32-
puts "Invalid plugin specification: #{line}"
33-
end
34-
}
35-
return pods_ary
23+
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
3624
end
3725

38-
target 'Runner' do
39-
use_frameworks!
26+
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
4027

41-
# Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
42-
# referring to absolute paths on developers' machines.
43-
system('rm -rf .symlinks')
44-
system('mkdir -p .symlinks/plugins')
28+
flutter_ios_podfile_setup
4529

46-
# Flutter Pods
47-
generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
48-
if generated_xcode_build_settings.empty?
49-
puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first."
50-
end
51-
generated_xcode_build_settings.map { |p|
52-
if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
53-
symlink = File.join('.symlinks', 'flutter')
54-
File.symlink(File.dirname(p[:path]), symlink)
55-
pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
56-
end
57-
}
30+
target 'Runner' do
31+
use_frameworks!
32+
use_modular_headers!
5833

59-
# Plugin Pods
60-
plugin_pods = parse_KV_file('../.flutter-plugins')
61-
plugin_pods.map { |p|
62-
symlink = File.join('.symlinks', 'plugins', p[:name])
63-
File.symlink(p[:path], symlink)
64-
pod p[:name], :path => File.join(symlink, 'ios')
65-
}
34+
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
35+
# target 'RunnerTests' do
36+
# inherit! :search_paths
37+
# end
6638
end
6739

68-
# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system.
69-
install! 'cocoapods', :disable_input_output_paths => true
70-
7140
post_install do |installer|
7241
installer.pods_project.targets.each do |target|
73-
target.build_configurations.each do |config|
74-
config.build_settings['ENABLE_BITCODE'] = 'NO'
75-
end
42+
flutter_additional_ios_build_settings(target)
7643
end
7744
end

‎ios/Podfile.lock

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
PODS:
22
- Flutter (1.0.0)
3-
- shared_preferences (0.0.1):
3+
- shared_preferences_foundation (0.0.1):
44
- Flutter
5+
- FlutterMacOS
56

67
DEPENDENCIES:
7-
- Flutter (from `.symlinks/flutter/ios`)
8-
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
8+
- Flutter (from `Flutter`)
9+
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
910

1011
EXTERNAL SOURCES:
1112
Flutter:
12-
:path: ".symlinks/flutter/ios"
13-
shared_preferences:
14-
:path: ".symlinks/plugins/shared_preferences/ios"
13+
:path: Flutter
14+
shared_preferences_foundation:
15+
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
1516

1617
SPEC CHECKSUMS:
17-
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
18-
shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523
18+
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
19+
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
1920

20-
PODFILE CHECKSUM: 10ae9c18d12c9ffc2275c9a159a3b1e281990db0
21+
PODFILE CHECKSUM: aa3b1d9cb94e8055dc6468141196cf9e4c8e33df
2122

22-
COCOAPODS: 1.7.5
23+
COCOAPODS: 1.11.3

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /