Skip to content

Commit baf2882

Browse files
dcharkesjonasfj
dcharkes
and
jonasfj
authored
Dart 2.12 preview (#14)
* Rolled forward all dependencies to Dart 2.12 previews. * Migrated breaking changes for package:ffi 1.0.0. * Bumped SDK constraint to Dart 2.12 beta. * Xcode example project update. Co-authored-by: Jonas Finnemann Jensen <[email protected]>
1 parent 9ae230d commit baf2882

File tree

9 files changed

+86
-77
lines changed

9 files changed

+86
-77
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 0.5.0
2+
* Rolled forward all dependencies to Dart 2.12 previews.
3+
* Migrated breaking changes for [package:ffi](https://pub.dev/packages/ffi) version `1.0.0`.
4+
* Bumped SDK constraint to Dart 2.12 beta.
5+
16
# 0.5.0-null-safety.0
27
* Ported to null-safety without any breaking changes.
38

‎example/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
1414
:path: ".symlinks/plugins/webcrypto/ios"
1515

1616
SPEC CHECKSUMS:
17-
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
17+
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
1818
webcrypto: ac37b97f415c7114abb8af22d58048b5cbcb23d3
1919

2020
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
2121

22-
COCOAPODS: 1.8.4
22+
COCOAPODS: 1.10.1

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

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -68,7 +68,6 @@
6868
195D5CFEADD5A36C662F6E46 /* Pods-Runner.release.xcconfig */,
6969
8052FB3B9610C16F66CB95AA /* Pods-Runner.profile.xcconfig */,
7070
);
71-
name = Pods;
7271
path = Pods;
7372
sourceTree = "<group>";
7473
};
@@ -164,7 +163,7 @@
164163
97C146E61CF9000F007C117D /* Project object */ = {
165164
isa = PBXProject;
166165
attributes = {
167-
LastUpgradeCheck = 1020;
166+
LastUpgradeCheck = 1240;
168167
ORGANIZATIONNAME = "";
169168
TargetAttributes = {
170169
97C146ED1CF9000F007C117D = {
@@ -211,15 +210,12 @@
211210
buildActionMask = 2147483647;
212211
files = (
213212
);
214-
inputPaths = (
215-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
216-
"${PODS_ROOT}/../Flutter/Flutter.framework",
217-
"${BUILT_PRODUCTS_DIR}/webcrypto/webcrypto.framework",
213+
inputFileListPaths = (
214+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
218215
);
219216
name = "[CP] Embed Pods Frameworks";
220-
outputPaths = (
221-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
222-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webcrypto.framework",
217+
outputFileListPaths = (
218+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
223219
);
224220
runOnlyForDeploymentPostprocessing = 0;
225221
shellPath = /bin/sh;
@@ -333,6 +329,7 @@
333329
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
334330
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
335331
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
332+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
336333
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
337334
CLANG_WARN_STRICT_PROTOTYPES = YES;
338335
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -351,7 +348,7 @@
351348
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
352349
GCC_WARN_UNUSED_FUNCTION = YES;
353350
GCC_WARN_UNUSED_VARIABLE = YES;
354-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
351+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
355352
MTL_ENABLE_DEBUG_INFO = NO;
356353
SDKROOT = iphoneos;
357354
SUPPORTED_PLATFORMS = iphoneos;
@@ -367,13 +364,17 @@
367364
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
368365
CLANG_ENABLE_MODULES = YES;
369366
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
367+
DEVELOPMENT_TEAM = RK26VGYA38;
370368
ENABLE_BITCODE = NO;
371369
FRAMEWORK_SEARCH_PATHS = (
372370
"$(inherited)",
373371
"$(PROJECT_DIR)/Flutter",
374372
);
375373
INFOPLIST_FILE = Runner/Info.plist;
376-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
374+
LD_RUNPATH_SEARCH_PATHS = (
375+
"$(inherited)",
376+
"@executable_path/Frameworks",
377+
);
377378
LIBRARY_SEARCH_PATHS = (
378379
"$(inherited)",
379380
"$(PROJECT_DIR)/Flutter",
@@ -409,6 +410,7 @@
409410
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
410411
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
411412
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
413+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
412414
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
413415
CLANG_WARN_STRICT_PROTOTYPES = YES;
414416
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -433,7 +435,7 @@
433435
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
434436
GCC_WARN_UNUSED_FUNCTION = YES;
435437
GCC_WARN_UNUSED_VARIABLE = YES;
436-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
438+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
437439
MTL_ENABLE_DEBUG_INFO = YES;
438440
ONLY_ACTIVE_ARCH = YES;
439441
SDKROOT = iphoneos;
@@ -464,6 +466,7 @@
464466
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
465467
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
466468
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
469+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
467470
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
468471
CLANG_WARN_STRICT_PROTOTYPES = YES;
469472
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -482,11 +485,12 @@
482485
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
483486
GCC_WARN_UNUSED_FUNCTION = YES;
484487
GCC_WARN_UNUSED_VARIABLE = YES;
485-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
488+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
486489
MTL_ENABLE_DEBUG_INFO = NO;
487490
SDKROOT = iphoneos;
488491
SUPPORTED_PLATFORMS = iphoneos;
489-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
492+
SWIFT_COMPILATION_MODE = wholemodule;
493+
SWIFT_OPTIMIZATION_LEVEL = "-O";
490494
TARGETED_DEVICE_FAMILY = "1,2";
491495
VALIDATE_PRODUCT = YES;
492496
};
@@ -499,13 +503,17 @@
499503
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
500504
CLANG_ENABLE_MODULES = YES;
501505
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
506+
DEVELOPMENT_TEAM = RK26VGYA38;
502507
ENABLE_BITCODE = NO;
503508
FRAMEWORK_SEARCH_PATHS = (
504509
"$(inherited)",
505510
"$(PROJECT_DIR)/Flutter",
506511
);
507512
INFOPLIST_FILE = Runner/Info.plist;
508-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
513+
LD_RUNPATH_SEARCH_PATHS = (
514+
"$(inherited)",
515+
"@executable_path/Frameworks",
516+
);
509517
LIBRARY_SEARCH_PATHS = (
510518
"$(inherited)",
511519
"$(PROJECT_DIR)/Flutter",
@@ -526,13 +534,17 @@
526534
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
527535
CLANG_ENABLE_MODULES = YES;
528536
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
537+
DEVELOPMENT_TEAM = RK26VGYA38;
529538
ENABLE_BITCODE = NO;
530539
FRAMEWORK_SEARCH_PATHS = (
531540
"$(inherited)",
532541
"$(PROJECT_DIR)/Flutter",
533542
);
534543
INFOPLIST_FILE = Runner/Info.plist;
535-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
544+
LD_RUNPATH_SEARCH_PATHS = (
545+
"$(inherited)",
546+
"@executable_path/Frameworks",
547+
);
536548
LIBRARY_SEARCH_PATHS = (
537549
"$(inherited)",
538550
"$(PROJECT_DIR)/Flutter",

‎example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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 = "1020"
3+
LastUpgradeVersion = "1240"
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 = "Profile"

0 commit comments

Comments
 (0)