Skip to content

Commit 34bd675

Browse files
lukepighettilukepighetti
authored
Merge pull request #18 from lukepighetti/update-dependencies
Update dependencies
2 parents 0346645 + ebedb64 commit 34bd675

File tree

7 files changed

+112
-71
lines changed

7 files changed

+112
-71
lines changed

‎example/.flutter-plugins-dependencies‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎example/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,5 @@ build/
6969
!**/ios/**/default.pbxuser
7070
!**/ios/**/default.perspectivev3
7171
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
72+
73+
.flutter-plugins-dependencies

‎example/ios/Flutter/Debug.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "Generated.xcconfig"

‎example/ios/Flutter/Release.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "Generated.xcconfig"

‎example/ios/Podfile‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Uncomment this line to define a global platform for your project
2+
# platform :ios, '9.0'
3+
4+
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
5+
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
6+
7+
project 'Runner', {
8+
'Debug' => :debug,
9+
'Profile' => :release,
10+
'Release' => :release,
11+
}
12+
13+
def parse_KV_file(file, separator='=')
14+
file_abs_path = File.expand_path(file)
15+
if !File.exists? file_abs_path
16+
return [];
17+
end
18+
generated_key_values = {}
19+
skip_line_start_symbols = ["#", "/"]
20+
File.foreach(file_abs_path) do |line|
21+
next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
22+
plugin = line.split(pattern=separator)
23+
if plugin.length == 2
24+
podname = plugin[0].strip()
25+
path = plugin[1].strip()
26+
podpath = File.expand_path("#{path}", file_abs_path)
27+
generated_key_values[podname] = podpath
28+
else
29+
puts "Invalid plugin specification: #{line}"
30+
end
31+
end
32+
generated_key_values
33+
end
34+
35+
target 'Runner' do
36+
use_frameworks!
37+
use_modular_headers!
38+
39+
# Flutter Pod
40+
41+
copied_flutter_dir = File.join(__dir__, 'Flutter')
42+
copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
43+
copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
44+
unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
45+
# Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
46+
# That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
47+
# CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
48+
49+
generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
50+
unless File.exist?(generated_xcode_build_settings_path)
51+
raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
52+
end
53+
generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
54+
cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
55+
56+
unless File.exist?(copied_framework_path)
57+
FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
58+
end
59+
unless File.exist?(copied_podspec_path)
60+
FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
61+
end
62+
end
63+
64+
# Keep pod path relative so it can be checked into Podfile.lock.
65+
pod 'Flutter', :path => 'Flutter'
66+
67+
# Plugin Pods
68+
69+
# Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
70+
# referring to absolute paths on developers' machines.
71+
system('rm -rf .symlinks')
72+
system('mkdir -p .symlinks/plugins')
73+
plugin_pods = parse_KV_file('../.flutter-plugins')
74+
plugin_pods.each do |name, path|
75+
symlink = File.join('.symlinks', 'plugins', name)
76+
File.symlink(path, symlink)
77+
pod name, :path => File.join(symlink, 'ios')
78+
end
79+
end
80+
81+
post_install do |installer|
82+
installer.pods_project.targets.each do |target|
83+
target.build_configurations.each do |config|
84+
config.build_settings['ENABLE_BITCODE'] = 'NO'
85+
end
86+
end
87+
end

‎pubspec.lock‎

Lines changed: 19 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,48 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4-
archive:
5-
dependency: transitive
6-
description:
7-
name: archive
8-
url: "https://pub.dartlang.org"
9-
source: hosted
10-
version: "2.0.11"
11-
args:
12-
dependency: transitive
13-
description:
14-
name: args
15-
url: "https://pub.dartlang.org"
16-
source: hosted
17-
version: "1.5.2"
184
async:
195
dependency: transitive
206
description:
217
name: async
228
url: "https://pub.dartlang.org"
239
source: hosted
24-
version: "2.4.0"
10+
version: "2.4.1"
2511
boolean_selector:
2612
dependency: transitive
2713
description:
2814
name: boolean_selector
2915
url: "https://pub.dartlang.org"
3016
source: hosted
31-
version: "1.0.5"
17+
version: "2.0.0"
3218
charcode:
3319
dependency: transitive
3420
description:
3521
name: charcode
3622
url: "https://pub.dartlang.org"
3723
source: hosted
38-
version: "1.1.2"
39-
collection:
24+
version: "1.1.3"
25+
clock:
4026
dependency: transitive
4127
description:
42-
name: collection
28+
name: clock
4329
url: "https://pub.dartlang.org"
4430
source: hosted
45-
version: "1.14.11"
46-
convert:
31+
version: "1.0.1"
32+
collection:
4733
dependency: transitive
4834
description:
49-
name: convert
35+
name: collection
5036
url: "https://pub.dartlang.org"
5137
source: hosted
52-
version: "2.1.1"
53-
crypto:
38+
version: "1.14.12"
39+
fake_async:
5440
dependency: transitive
5541
description:
56-
name: crypto
42+
name: fake_async
5743
url: "https://pub.dartlang.org"
5844
source: hosted
59-
version: "2.1.3"
45+
version: "1.1.0"
6046
flutter:
6147
dependency: "direct main"
6248
description: flutter
@@ -72,13 +58,6 @@ packages:
7258
description: flutter
7359
source: sdk
7460
version: "0.0.0"
75-
image:
76-
dependency: transitive
77-
description:
78-
name: image
79-
url: "https://pub.dartlang.org"
80-
source: hosted
81-
version: "2.1.4"
8261
matcher:
8362
dependency: transitive
8463
description:
@@ -99,42 +78,21 @@ packages:
9978
name: path
10079
url: "https://pub.dartlang.org"
10180
source: hosted
102-
version: "1.6.4"
103-
pedantic:
104-
dependency: transitive
105-
description:
106-
name: pedantic
107-
url: "https://pub.dartlang.org"
108-
source: hosted
109-
version: "1.8.0+1"
110-
petitparser:
111-
dependency: transitive
112-
description:
113-
name: petitparser
114-
url: "https://pub.dartlang.org"
115-
source: hosted
116-
version: "2.4.0"
117-
quiver:
118-
dependency: transitive
119-
description:
120-
name: quiver
121-
url: "https://pub.dartlang.org"
122-
source: hosted
123-
version: "2.0.5"
81+
version: "1.7.0"
12482
rxdart:
12583
dependency: "direct main"
12684
description:
12785
name: rxdart
12886
url: "https://pub.dartlang.org"
12987
source: hosted
130-
version: "0.23.1"
88+
version: "0.24.1"
13189
shared_preferences:
13290
dependency: "direct main"
13391
description:
13492
name: shared_preferences
13593
url: "https://pub.dartlang.org"
13694
source: hosted
137-
version: "0.5.6"
95+
version: "0.5.7+3"
13896
shared_preferences_macos:
13997
dependency: transitive
14098
description:
@@ -167,7 +125,7 @@ packages:
167125
name: source_span
168126
url: "https://pub.dartlang.org"
169127
source: hosted
170-
version: "1.5.5"
128+
version: "1.7.0"
171129
stack_trace:
172130
dependency: transitive
173131
description:
@@ -202,7 +160,7 @@ packages:
202160
name: test_api
203161
url: "https://pub.dartlang.org"
204162
source: hosted
205-
version: "0.2.11"
163+
version: "0.2.16"
206164
typed_data:
207165
dependency: transitive
208166
description:
@@ -217,13 +175,6 @@ packages:
217175
url: "https://pub.dartlang.org"
218176
source: hosted
219177
version: "2.0.8"
220-
xml:
221-
dependency: transitive
222-
description:
223-
name: xml
224-
url: "https://pub.dartlang.org"
225-
source: hosted
226-
version: "3.5.0"
227178
sdks:
228-
dart: ">=2.6.0 <3.0.0"
229-
flutter: ">=1.12.13+hotfix.4 <2.0.0"
179+
dart: ">=2.7.0 <3.0.0"
180+
flutter: ">=1.12.13+hotfix.5 <2.0.0"

‎pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ dependencies:
1010
flutter:
1111
sdk: flutter
1212

13-
rxdart: ^0.23.1
14-
shared_preferences: ^0.5.3
13+
rxdart: ^0.24.1
14+
shared_preferences: ^0.5.7+3
1515

1616
dev_dependencies:
1717
flutter_test:

0 commit comments

Comments
 (0)