Skip to content

Commit 58192f4

Browse files
otopbaotopba
authored
Merge pull request flutter#8 from flutter/master
Update master
2 parents ce695b1 + d7c909c commit 58192f4

File tree

175 files changed

+1472
-757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+1472
-757
lines changed

‎.ci/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
FROM cirrusci/flutter:latest
1+
FROM cirrusci/flutter:stable
32

43
RUN yes | sdkmanager \
54
"platforms;android-27" \

‎.cirrus.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ task:
6464
matrix:
6565
- name: build_all_plugins_ipa
6666
script: ./script/build_all_plugins_app.sh ios --no-codesign
67+
- name: lint_darwin_plugins
68+
script: ./script/lint_darwin_plugins.sh
6769
- name: build-ipas+drive-examples
6870
env:
6971
PATH: $PATH:/usr/local/bin

‎packages/android_alarm_manager/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## 0.4.4+1
22

33
* Update and migrate iOS example project.
4+
* Define clang module for iOS.
45

56
## 0.4.4
67

‎packages/android_alarm_manager/ios/Classes/AndroidAlarmManagerPlugin.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
99
FlutterMethodChannel* channel =
1010
[FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/android_alarm_manager"
1111
binaryMessenger:[registrar messenger]
12-
codec:[FlutterJSONMessageCodec sharedInstance]];
12+
codec:[FlutterJSONMethodCodec sharedInstance]];
1313
FLTAndroidAlarmManagerPlugin* instance = [[FLTAndroidAlarmManagerPlugin alloc] init];
1414
[registrar addMethodCallDelegate:instance channel:channel];
1515
}

‎packages/android_alarm_manager/ios/android_alarm_manager.podspec‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ A new flutter plugin project.
1515
s.source_files = 'Classes/**/*'
1616
s.public_header_files = 'Classes/**/*.h'
1717
s.dependency 'Flutter'
18-
19-
s.ios.deployment_target = '8.0'
18+
s.platform = :ios, '8.0'
19+
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
2020
end
21-

‎packages/android_intent/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 0.3.3+3
2+
3+
* Define clang module for iOS.
4+
5+
## 0.3.3+2
6+
7+
* Update and migrate iOS example project.
8+
19
## 0.3.3+1
210

311
* Added "action_application_details_settings" action to open application info settings .

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

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@
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-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1312
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1413
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1514
3FC5CBD67A867C34C8CFD7E1 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7ABB9ACA70E30025F77BB759 /* libPods-Runner.a */; };
1615
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
1716
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
18-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
19-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
2017
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
2118
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
2219
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -43,7 +40,6 @@
4340
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4441
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4542
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
46-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4743
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4844
7ABB9ACA70E30025F77BB759 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4945
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -58,6 +54,8 @@
5854
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5955
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6056
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
57+
9B21C620C27B8C2AF08BFA21 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
58+
EFC3461395B2546568135556 /* 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>"; };
6159
/* End PBXFileReference section */
6260

6361
/* Begin PBXFrameworksBuildPhase section */
@@ -77,6 +75,8 @@
7775
2C36A917BF8B34817D5A406D /* Pods */ = {
7876
isa = PBXGroup;
7977
children = (
78+
EFC3461395B2546568135556 /* Pods-Runner.debug.xcconfig */,
79+
9B21C620C27B8C2AF08BFA21 /* Pods-Runner.release.xcconfig */,
8080
);
8181
name = Pods;
8282
sourceTree = "<group>";
@@ -94,7 +94,6 @@
9494
children = (
9595
3B80C3931E831B6300D905FE /* App.framework */,
9696
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
97-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9897
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9998
9740EEB21CF90195004384FC /* Debug.xcconfig */,
10099
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -161,7 +160,6 @@
161160
9705A1C41CF9048500538489 /* Embed Frameworks */,
162161
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
163162
4B2738B48C3E53795176CD79 /* [CP] Embed Pods Frameworks */,
164-
B23D1C01D32617384EBE7F0E /* [CP] Copy Pods Resources */,
165163
);
166164
buildRules = (
167165
);
@@ -178,7 +176,7 @@
178176
97C146E61CF9000F007C117D /* Project object */ = {
179177
isa = PBXProject;
180178
attributes = {
181-
LastUpgradeCheck = 0830;
179+
LastUpgradeCheck = 1100;
182180
ORGANIZATIONNAME = "The Chromium Authors";
183181
TargetAttributes = {
184182
97C146ED1CF9000F007C117D = {
@@ -188,7 +186,7 @@
188186
};
189187
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
190188
compatibilityVersion = "Xcode 3.2";
191-
developmentRegion = English;
189+
developmentRegion = en;
192190
hasScannedForEncodings = 0;
193191
knownRegions = (
194192
en,
@@ -210,10 +208,7 @@
210208
buildActionMask = 2147483647;
211209
files = (
212210
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
213-
9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
214211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
215-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
216-
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
217212
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
218213
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
219214
);
@@ -248,7 +243,7 @@
248243
);
249244
runOnlyForDeploymentPostprocessing = 0;
250245
shellPath = /bin/sh;
251-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
246+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
252247
showEnvVarsInLog = 0;
253248
};
254249
9740EEB61CF901F6004384FC /* Run Script */ = {
@@ -265,34 +260,22 @@
265260
shellPath = /bin/sh;
266261
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
267262
};
268-
B23D1C01D32617384EBE7F0E /* [CP] Copy Pods Resources */ = {
269-
isa = PBXShellScriptBuildPhase;
270-
buildActionMask = 2147483647;
271-
files = (
272-
);
273-
inputPaths = (
274-
);
275-
name = "[CP] Copy Pods Resources";
276-
outputPaths = (
277-
);
278-
runOnlyForDeploymentPostprocessing = 0;
279-
shellPath = /bin/sh;
280-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
281-
showEnvVarsInLog = 0;
282-
};
283263
ECD6A6833016AB689F7B8471 /* [CP] Check Pods Manifest.lock */ = {
284264
isa = PBXShellScriptBuildPhase;
285265
buildActionMask = 2147483647;
286266
files = (
287267
);
288268
inputPaths = (
269+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
270+
"${PODS_ROOT}/Manifest.lock",
289271
);
290272
name = "[CP] Check Pods Manifest.lock";
291273
outputPaths = (
274+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
292275
);
293276
runOnlyForDeploymentPostprocessing = 0;
294277
shellPath = /bin/sh;
295-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
278+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
296279
showEnvVarsInLog = 0;
297280
};
298281
/* End PBXShellScriptBuildPhase section */
@@ -335,19 +318,28 @@
335318
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
336319
buildSettings = {
337320
ALWAYS_SEARCH_USER_PATHS = NO;
321+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
338322
CLANG_ANALYZER_NONNULL = YES;
339323
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
340324
CLANG_CXX_LIBRARY = "libc++";
341325
CLANG_ENABLE_MODULES = YES;
342326
CLANG_ENABLE_OBJC_ARC = YES;
327+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
343328
CLANG_WARN_BOOL_CONVERSION = YES;
329+
CLANG_WARN_COMMA = YES;
344330
CLANG_WARN_CONSTANT_CONVERSION = YES;
331+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
345332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
346333
CLANG_WARN_EMPTY_BODY = YES;
347334
CLANG_WARN_ENUM_CONVERSION = YES;
348335
CLANG_WARN_INFINITE_RECURSION = YES;
349336
CLANG_WARN_INT_CONVERSION = YES;
337+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
338+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
339+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
350340
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
341+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
342+
CLANG_WARN_STRICT_PROTOTYPES = YES;
351343
CLANG_WARN_SUSPICIOUS_MOVE = YES;
352344
CLANG_WARN_UNREACHABLE_CODE = YES;
353345
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -383,19 +375,28 @@
383375
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
384376
buildSettings = {
385377
ALWAYS_SEARCH_USER_PATHS = NO;
378+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
386379
CLANG_ANALYZER_NONNULL = YES;
387380
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
388381
CLANG_CXX_LIBRARY = "libc++";
389382
CLANG_ENABLE_MODULES = YES;
390383
CLANG_ENABLE_OBJC_ARC = YES;
384+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
391385
CLANG_WARN_BOOL_CONVERSION = YES;
386+
CLANG_WARN_COMMA = YES;
392387
CLANG_WARN_CONSTANT_CONVERSION = YES;
388+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
393389
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
394390
CLANG_WARN_EMPTY_BODY = YES;
395391
CLANG_WARN_ENUM_CONVERSION = YES;
396392
CLANG_WARN_INFINITE_RECURSION = YES;
397393
CLANG_WARN_INT_CONVERSION = YES;
394+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
395+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
396+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
398397
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
398+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
399+
CLANG_WARN_STRICT_PROTOTYPES = YES;
399400
CLANG_WARN_SUSPICIOUS_MOVE = YES;
400401
CLANG_WARN_UNREACHABLE_CODE = YES;
401402
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -424,7 +425,6 @@
424425
isa = XCBuildConfiguration;
425426
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
426427
buildSettings = {
427-
ARCHS = arm64;
428428
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
429429
ENABLE_BITCODE = NO;
430430
FRAMEWORK_SEARCH_PATHS = (
@@ -446,7 +446,6 @@
446446
isa = XCBuildConfiguration;
447447
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
448448
buildSettings = {
449-
ARCHS = arm64;
450449
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
451450
ENABLE_BITCODE = NO;
452451
FRAMEWORK_SEARCH_PATHS = (

‎packages/android_intent/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:Runner.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:Runner.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

‎packages/android_intent/ios/android_intent.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ A new flutter plugin project.
1515
s.source_files = 'Classes/**/*'
1616
s.public_header_files = 'Classes/**/*.h'
1717
s.dependency 'Flutter'
18-
19-
s.ios.deployment_target = '8.0'
18+
s.platform = :ios, '8.0'
19+
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
2020
end
2121

‎packages/android_intent/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: android_intent
22
description: Flutter plugin for launching Android Intents. Not supported on iOS.
33
author: Flutter Team <flutter-dev@googlegroups.com>
44
homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
5-
version: 0.3.3+1
5+
version: 0.3.3+3
66

77
flutter:
88
plugin:

0 commit comments

Comments
 (0)