Skip to content

Commit c6a3826

Browse files
author
Max Onishi
committed
upgrade package
1 parent 7511240 commit c6a3826

File tree

12 files changed

+98
-82
lines changed

12 files changed

+98
-82
lines changed

‎.dart_tool/package_config.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "collection",
6-
"rootUri": "file:///Users/onikiri/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11",
6+
"rootUri": "file:///Users/onikiri/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12",
77
"packageUri": "lib/",
88
"languageVersion": "2.0"
99
},
@@ -33,9 +33,9 @@
3333
},
3434
{
3535
"name": "shared_preferences",
36-
"rootUri": "file:///Users/onikiri/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.6+1",
36+
"rootUri": "file:///Users/onikiri/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.7+3",
3737
"packageUri": "lib/",
38-
"languageVersion": "2.0"
38+
"languageVersion": "2.1"
3939
},
4040
{
4141
"name": "shared_preferences_macos",
@@ -63,9 +63,9 @@
6363
},
6464
{
6565
"name": "smooth_star_rating",
66-
"rootUri": "file:///Users/onikiri/flutter/.pub-cache/hosted/pub.dartlang.org/smooth_star_rating-1.0.4+2",
66+
"rootUri": "file:///Users/onikiri/flutter/.pub-cache/hosted/pub.dartlang.org/smooth_star_rating-1.1.1",
6767
"packageUri": "lib/",
68-
"languageVersion": "2.0"
68+
"languageVersion": "2.7"
6969
},
7070
{
7171
"name": "typed_data",
@@ -83,10 +83,10 @@
8383
"name": "rate_my_app",
8484
"rootUri": "../",
8585
"packageUri": "lib/",
86-
"languageVersion": "2.1"
86+
"languageVersion": "2.7"
8787
}
8888
],
89-
"generated": "2020-02-19T04:52:58.997915Z",
89+
"generated": "2020-06-04T03:57:31.422398Z",
9090
"generator": "pub",
91-
"generatorVersion": "2.7.0"
91+
"generatorVersion": "2.8.3"
9292
}

‎example/ios/Flutter/flutter_export_environment.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export "FLUTTER_APPLICATION_PATH=/Users/onikiri/projects/RateMyApp/example"
55
export "FLUTTER_TARGET=/Users/onikiri/projects/RateMyApp/example/lib/main.dart"
66
export "FLUTTER_BUILD_DIR=build"
77
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
8+
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
89
export "FLUTTER_FRAMEWORK_DIR=/Users/onikiri/flutter/bin/cache/artifacts/engine/ios"
910
export "FLUTTER_BUILD_NAME=1.0.0"
1011
export "FLUTTER_BUILD_NUMBER=1"

‎example/ios/Podfile‎

Lines changed: 49 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,64 @@ def parse_KV_file(file, separator='=')
1515
if !File.exists? file_abs_path
1616
return [];
1717
end
18-
pods_ary = []
18+
generated_key_values = {}
1919
skip_line_start_symbols = ["#", "/"]
20-
File.foreach(file_abs_path) { |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-
pods_ary.push({:name => podname, :path => podpath});
28-
else
29-
puts "Invalid plugin specification: #{line}"
30-
end
31-
}
32-
return pods_ary
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
3333
end
3434

3535
target 'Runner' do
36-
# Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
37-
# referring to absolute paths on developers' machines.
38-
system('rm -rf .symlinks')
39-
system('mkdir -p .symlinks/plugins')
36+
# Flutter Pod
4037

41-
# Flutter Pods
42-
generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
43-
if generated_xcode_build_settings.empty?
44-
puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first."
45-
end
46-
generated_xcode_build_settings.map { |p|
47-
if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
48-
symlink = File.join('.symlinks', 'flutter')
49-
File.symlink(File.dirname(p[:path]), symlink)
50-
pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
38+
copied_flutter_dir = File.join(__dir__, 'Flutter')
39+
copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
40+
copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
41+
unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
42+
# Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
43+
# That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
44+
# CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
45+
46+
generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
47+
unless File.exist?(generated_xcode_build_settings_path)
48+
raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
5149
end
52-
}
50+
generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
51+
cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
52+
53+
unless File.exist?(copied_framework_path)
54+
FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
55+
end
56+
unless File.exist?(copied_podspec_path)
57+
FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
58+
end
59+
end
60+
61+
# Keep pod path relative so it can be checked into Podfile.lock.
62+
pod 'Flutter', :path => 'Flutter'
5363

5464
# Plugin Pods
65+
66+
# Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
67+
# referring to absolute paths on developers' machines.
68+
system('rm -rf .symlinks')
69+
system('mkdir -p .symlinks/plugins')
5570
plugin_pods = parse_KV_file('../.flutter-plugins')
56-
plugin_pods.map { |p|
57-
symlink = File.join('.symlinks', 'plugins', p[:name])
58-
File.symlink(p[:path], symlink)
59-
pod p[:name], :path => File.join(symlink, 'ios')
60-
}
71+
plugin_pods.each do |name, path|
72+
symlink = File.join('.symlinks', 'plugins', name)
73+
File.symlink(path, symlink)
74+
pod name, :path => File.join(symlink, 'ios')
75+
end
6176
end
6277

6378
post_install do |installer|

‎example/ios/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ PODS:
1010
- Flutter
1111

1212
DEPENDENCIES:
13-
- Flutter (from `.symlinks/flutter/ios`)
13+
- Flutter (from `Flutter`)
1414
- rate_my_app (from `.symlinks/plugins/rate_my_app/ios`)
1515
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
1616
- shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
1717
- shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
1818

1919
EXTERNAL SOURCES:
2020
Flutter:
21-
:path: ".symlinks/flutter/ios"
21+
:path: Flutter
2222
rate_my_app:
2323
:path: ".symlinks/plugins/rate_my_app/ios"
2424
shared_preferences:
@@ -31,10 +31,10 @@ EXTERNAL SOURCES:
3131
SPEC CHECKSUMS:
3232
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
3333
rate_my_app: 45513a2f4d9a55b7b46d19b64fc13882fd101157
34-
shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
34+
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
3535
shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
3636
shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
3737

38-
PODFILE CHECKSUM: aff02bfeed411c636180d6812254b2daeea14d09
38+
PODFILE CHECKSUM: f32fb4e7c14f8b3ca19a369d7be425dd9241af27
3939

40-
COCOAPODS: 1.8.4
40+
COCOAPODS: 1.9.1

‎example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
14-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
15-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1612
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1713
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1814
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
@@ -29,8 +25,6 @@
2925
dstPath = "";
3026
dstSubfolderSpec = 10;
3127
files = (
32-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
33-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3428
);
3529
name = "Embed Frameworks";
3630
runOnlyForDeploymentPostprocessing = 0;
@@ -44,14 +38,12 @@
4438
27EFE3EBED7957F0839AF353 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4539
3A8414E9C5B17F5A7B6C9CD3 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4640
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
47-
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4841
67A5C835EA04BC2971564432 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
4942
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
5043
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
5144
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
5245
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5346
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
54-
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
5547
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5648
97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
5749
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -65,8 +57,6 @@
6557
isa = PBXFrameworksBuildPhase;
6658
buildActionMask = 2147483647;
6759
files = (
68-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
69-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
7060
CCF2252C4E88D4B9A2033EEF /* libPods-Runner.a in Frameworks */,
7161
);
7262
runOnlyForDeploymentPostprocessing = 0;
@@ -95,9 +85,7 @@
9585
9740EEB11CF90186004384FC /* Flutter */ = {
9686
isa = PBXGroup;
9787
children = (
98-
3B80C3931E831B6300D905FE /* App.framework */,
9988
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
100-
9740EEBA1CF902C7004384FC /* Flutter.framework */,
10189
9740EEB21CF90195004384FC /* Debug.xcconfig */,
10290
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
10391
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -184,6 +172,7 @@
184172
TargetAttributes = {
185173
97C146ED1CF9000F007C117D = {
186174
CreatedOnToolsVersion = 7.3.1;
175+
DevelopmentTeam = 8JP699MQSS;
187176
};
188177
};
189178
};
@@ -192,6 +181,7 @@
192181
developmentRegion = English;
193182
hasScannedForEncodings = 0;
194183
knownRegions = (
184+
English,
195185
en,
196186
Base,
197187
);
@@ -233,7 +223,7 @@
233223
);
234224
runOnlyForDeploymentPostprocessing = 0;
235225
shellPath = /bin/sh;
236-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
226+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
237227
};
238228
51CCF9BD1FAC17E9EC62F607 /* [CP] Embed Pods Frameworks */ = {
239229
isa = PBXShellScriptBuildPhase;
@@ -242,7 +232,7 @@
242232
);
243233
inputPaths = (
244234
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
245-
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
235+
"${PODS_ROOT}/../Flutter/Flutter.framework",
246236
);
247237
name = "[CP] Embed Pods Frameworks";
248238
outputPaths = (
@@ -504,6 +494,7 @@
504494
buildSettings = {
505495
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
506496
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
497+
DEVELOPMENT_TEAM = 8JP699MQSS;
507498
ENABLE_BITCODE = NO;
508499
FRAMEWORK_SEARCH_PATHS = (
509500
"$(inherited)",
@@ -527,6 +518,7 @@
527518
buildSettings = {
528519
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
529520
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
521+
DEVELOPMENT_TEAM = 8JP699MQSS;
530522
ENABLE_BITCODE = NO;
531523
FRAMEWORK_SEARCH_PATHS = (
532524
"$(inherited)",

example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings renamed to example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>BuildSystemType</key>
6-
<string>Original</string>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
77
</dict>
88
</plist>

‎example/lib/main.dart‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:rate_my_app/rate_my_app.dart';
44
import 'package:shared_preferences/shared_preferences.dart';
55

66
/// Main Rate my app instance.
7-
RateMyApp _rateMyApp = RateMyApp();
7+
RateMyApp _rateMyApp = RateMyApp(appStoreIdentifier: "1471292013");
88

99
/// First plugin test method.
1010
void main() {
@@ -76,6 +76,14 @@ class _RateMyAppTestAppBodyState extends State<_RateMyAppTestAppBody> {
7676
.then((_) => setState(() {})), // We launch the default Rate my app dialog.
7777
),
7878
),
79+
Padding(
80+
padding: const EdgeInsets.only(top: 10),
81+
child: RaisedButton(
82+
child: const Text('Launch "Store" dialog'),
83+
onPressed: () =>
84+
_rateMyApp.launchStore().then((_) => setState(() {})), // We launch the default Rate my app dialog.
85+
),
86+
),
7987
RaisedButton(
8088
child: const Text('Launch "Rate my app" star dialog'),
8189
onPressed: () => _rateMyApp.showStarRateDialog(context, actionsBuilder: (_, count) {

‎example/pubspec.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: collection
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "1.14.11"
10+
version: "1.14.12"
1111
flutter:
1212
dependency: "direct main"
1313
description: flutter
@@ -38,14 +38,14 @@ packages:
3838
path: ".."
3939
relative: true
4040
source: path
41-
version: "0.6.0"
41+
version: "0.6.1"
4242
shared_preferences:
4343
dependency: transitive
4444
description:
4545
name: shared_preferences
4646
url: "https://pub.dartlang.org"
4747
source: hosted
48-
version: "0.5.6+1"
48+
version: "0.5.7+3"
4949
shared_preferences_macos:
5050
dependency: transitive
5151
description:
@@ -78,7 +78,7 @@ packages:
7878
name: smooth_star_rating
7979
url: "https://pub.dartlang.org"
8080
source: hosted
81-
version: "1.0.4+2"
81+
version: "1.1.1"
8282
typed_data:
8383
dependency: transitive
8484
description:
@@ -94,5 +94,5 @@ packages:
9494
source: hosted
9595
version: "2.0.8"
9696
sdks:
97-
dart: ">=2.3.0 <3.0.0"
98-
flutter: ">=1.12.13+hotfix.4 <2.0.0"
97+
dart: ">=2.7.0 <3.0.0"
98+
flutter: ">=1.12.13+hotfix.5 <2.0.0"

‎example/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Demonstrates how to use the rate_my_app plugin.
33
publish_to: 'none'
44

55
environment:
6-
sdk: ">=2.3.0 <3.0.0"
6+
sdk: ">=2.6.0 <3.0.0"
77

88
dependencies:
99
flutter:

‎lib/src/dialogs.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ class RateMyAppStarDialogState extends State<RateMyAppStarDialog> {
273273
),
274274
),
275275
SmoothStarRating(
276-
onRatingChanged: (rating) {
276+
onRated: (rating) {
277277
setState(() => _currentRating = rating);
278278
},
279279
color: widget.starRatingOptions.starsFillColor,

0 commit comments

Comments
 (0)