Skip to content

Commit b87500b

Browse files
yulingtianxiayulingtianxia
committed
Merge branch 'release/0.7.9'
2 parents 744b945 + 21ec068 commit b87500b

File tree

83 files changed

+3940
-3582
lines changed

Some content is hidden

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

83 files changed

+3940
-3582
lines changed

‎dart_native/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 0.7.9
2+
3+
* Bump to ffi >=1.1.2
4+
* [Fix] Thread Performance Checker issue
5+
* [Fix] Flutter debug warning
6+
17
## 0.7.8
28

39
* [Fix] Build error on Xcode 12.

‎dart_native/example/ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SPEC CHECKSUMS:
2828
ClassWrittenInSwift: 84b95c3ec2633b0a18ffdcabf8365a5833a2154c
2929
CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
3030
dart_native: a9824de4c77f34e6a27da6d8eb21784efd5512c7
31-
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
31+
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
3232

3333
PODFILE CHECKSUM: 6e9979e89c4dd9698b3ed55a88e6a5100fa0dc38
3434

‎dart_native/example/ios/Runner/Info.plist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,9 @@
4545
</array>
4646
<key>UIViewControllerBasedStatusBarAppearance</key>
4747
<true/>
48+
<key>NSBonjourServices</key>
49+
<array>
50+
<string>_dartobservatory._tcp</string>
51+
</array>
4852
</dict>
4953
</plist>

‎dart_native/example/ios/Runner/RuntimeStub.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ - (instancetype)init {
2626
self = [super init];
2727
if (self) {
2828
_object = [NSObject new];
29-
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{
29+
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
3030
[NSNotificationCenter.defaultCenter postNotificationName:@"SampleDartNotification" object:nil];
3131
});
3232
}

‎dart_native/example/macos/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PODS:
2-
- ClassWrittenInSwift (0.0.4)
2+
- ClassWrittenInSwift (0.0.5)
33
- CocoaLumberjack/Core (3.7.4)
44
- CocoaLumberjack/Swift (3.7.4):
55
- CocoaLumberjack/Core
66
- dart_native (0.0.1):
7-
- ClassWrittenInSwift (~> 0.0.4)
7+
- ClassWrittenInSwift (~> 0.0.5)
88
- FlutterMacOS
99
- FlutterMacOS (1.0.0)
1010

@@ -25,11 +25,11 @@ EXTERNAL SOURCES:
2525
:path: Flutter/ephemeral
2626

2727
SPEC CHECKSUMS:
28-
ClassWrittenInSwift: de0543e7c1a836e190af74fddff84ad9b2f3d18c
28+
ClassWrittenInSwift: 84b95c3ec2633b0a18ffdcabf8365a5833a2154c
2929
CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
30-
dart_native: 1d89c58404bf2295b0725d24af16a907b1322fdd
30+
dart_native: 82f498a2edc283e94eac2d8ca51d609bdc52e74f
3131
FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
3232

3333
PODFILE CHECKSUM: 6134e1091881200875eedf81c63588922d4384ec
3434

35-
COCOAPODS: 1.11.2
35+
COCOAPODS: 1.11.3

‎dart_native/example/pubspec.lock‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ packages:
77
name: _fe_analyzer_shared
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "22.0.0"
10+
version: "31.0.0"
1111
analyzer:
1212
dependency: transitive
1313
description:
1414
name: analyzer
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.7.1"
17+
version: "2.8.0"
1818
args:
1919
dependency: transitive
2020
description:
@@ -28,7 +28,7 @@ packages:
2828
name: async
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "2.6.1"
31+
version: "2.8.2"
3232
boolean_selector:
3333
dependency: transitive
3434
description:
@@ -98,14 +98,14 @@ packages:
9898
name: characters
9999
url: "https://pub.dartlang.org"
100100
source: hosted
101-
version: "1.1.0"
101+
version: "1.2.0"
102102
charcode:
103103
dependency: transitive
104104
description:
105105
name: charcode
106106
url: "https://pub.dartlang.org"
107107
source: hosted
108-
version: "1.2.0"
108+
version: "1.3.1"
109109
checked_yaml:
110110
dependency: transitive
111111
description:
@@ -140,7 +140,7 @@ packages:
140140
name: collection
141141
url: "https://pub.dartlang.org"
142142
source: hosted
143-
version: "1.15.0"
143+
version: "1.16.0"
144144
convert:
145145
dependency: transitive
146146
description:
@@ -168,7 +168,7 @@ packages:
168168
path: ".."
169169
relative: true
170170
source: path
171-
version: "0.7.8"
171+
version: "0.7.9"
172172
dart_native_gen:
173173
dependency: transitive
174174
description:
@@ -189,7 +189,7 @@ packages:
189189
name: fake_async
190190
url: "https://pub.dartlang.org"
191191
source: hosted
192-
version: "1.2.0"
192+
version: "1.3.0"
193193
ffi:
194194
dependency: transitive
195195
description:
@@ -297,14 +297,21 @@ packages:
297297
name: matcher
298298
url: "https://pub.dartlang.org"
299299
source: hosted
300-
version: "0.12.10"
300+
version: "0.12.11"
301+
material_color_utilities:
302+
dependency: transitive
303+
description:
304+
name: material_color_utilities
305+
url: "https://pub.dartlang.org"
306+
source: hosted
307+
version: "0.1.4"
301308
meta:
302309
dependency: transitive
303310
description:
304311
name: meta
305312
url: "https://pub.dartlang.org"
306313
source: hosted
307-
version: "1.3.0"
314+
version: "1.7.0"
308315
mime:
309316
dependency: transitive
310317
description:
@@ -325,7 +332,7 @@ packages:
325332
name: path
326333
url: "https://pub.dartlang.org"
327334
source: hosted
328-
version: "1.8.0"
335+
version: "1.8.1"
329336
pedantic:
330337
dependency: transitive
331338
description:
@@ -386,7 +393,7 @@ packages:
386393
name: source_span
387394
url: "https://pub.dartlang.org"
388395
source: hosted
389-
version: "1.8.1"
396+
version: "1.8.2"
390397
stack_trace:
391398
dependency: transitive
392399
description:
@@ -428,7 +435,7 @@ packages:
428435
name: test_api
429436
url: "https://pub.dartlang.org"
430437
source: hosted
431-
version: "0.3.0"
438+
version: "0.4.9"
432439
timing:
433440
dependency: transitive
434441
description:
@@ -449,7 +456,7 @@ packages:
449456
name: vector_math
450457
url: "https://pub.dartlang.org"
451458
source: hosted
452-
version: "2.1.0"
459+
version: "2.1.2"
453460
watcher:
454461
dependency: transitive
455462
description:
@@ -472,5 +479,5 @@ packages:
472479
source: hosted
473480
version: "3.1.0"
474481
sdks:
475-
dart: ">=2.13.0 <3.0.0"
482+
dart: ">=2.17.0-0 <3.0.0"
476483
flutter: ">=2.2.0"

‎dart_native/ios/Classes/DNAssociatedDartObject.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
#import "DNAssociatedDartObject.h"
99
#import <objc/runtime.h>
10-
#import "native_runtime.h"
10+
11+
#import "DNMemoryValidation.h"
1112

1213
#if !__has_feature(objc_arc)
1314
#error

‎dart_native/ios/Classes/DNBlockCreator.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
#import "DNMacro.h"
9+
#import "DNExtern.h"
1010
#import "dart_api_dl.h"
11-
#import "native_runtime.h"
11+
#import "DNTypeEncoding.h"
1212

1313
#ifndef DNBlockCreator_h
1414
#define DNBlockCreator_h
1515

1616
NS_ASSUME_NONNULL_BEGIN
1717

18-
#pragma mark - Block Layout
18+
/// MARK: Block Layout
1919

2020
typedef void(*DNBlockCopyFunction)(void *, const void *);
2121
typedef void(*DNBlockDisposeFunction)(const void *);
@@ -52,7 +52,7 @@ typedef struct DNBlock {
5252
void *creator;
5353
} DNBlock;
5454

55-
#pragma mark - Block Creator
55+
/// MARK: Block Creator
5656

5757
DN_EXTERN const char *DNBlockTypeEncodeString(id blockObj);
5858
DN_EXTERN const char *_Nonnull *_Nonnull DNBlockTypeEncodings(id blockObj);

‎dart_native/ios/Classes/DNBlockCreator.m‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@
66
//
77

88
#import "DNBlockCreator.h"
9+
#import <objc/runtime.h>
10+
#import <stdatomic.h>
11+
912
#import "ffi.h"
1013
#import "DNFFIHelper.h"
1114
#import "DNInvocation.h"
12-
#import <objc/runtime.h>
1315
#import "DNPointerWrapper.h"
1416
#import "DNError.h"
15-
#import <stdatomic.h>
17+
#import "NSString+DartNative.h"
18+
#import "DNObjCRuntime.h"
19+
#import "DNDartBridge.h"
1620

1721
#if !__has_feature(objc_arc)
1822
#error
1923
#endif
2024

21-
#pragma mark - Block Helper
25+
/// MARK: Block Helper
2226

2327
enum {
2428
BLOCK_HAS_COPY_DISPOSE = (1 << 25),
@@ -72,7 +76,7 @@ void dispose_helper(DNBlock *src) {
7276
CFRelease(src->creator);
7377
}
7478

75-
#pragma mark - Block Wrapper
79+
/// MARK: Block Wrapper
7680

7781
@interface DNBlockCreator () {
7882
ffi_cif _cif;
@@ -190,7 +194,7 @@ - (id)blockWithError:(out NSError **)error {
190194
return block;
191195
}
192196

193-
#pragma mark - Private Method
197+
/// MARK: Private Method
194198

195199
- (int)_prepCIF:(ffi_cif *)cif withEncodeString:(const char *)str flags:(int32_t)flags {
196200
int argCount;
@@ -279,7 +283,7 @@ static void DNHandleReturnValue(void *origRet, DNBlockCreator *creator, DNInvoca
279283
return;
280284
} else if (creator.typeEncodings[0] == native_type_string) {
281285
// type is native_type_object but result is a string
282-
NSString *string = NSStringFromUTF16Data(*(const unichar **)ret);
286+
NSString *string = [NSString dn_stringWithUTF16String:*(const unichar **)ret];
283287
if (string) {
284288
native_retain_object(string);
285289
[invocation setReturnValue:&string];

‎dart_native/ios/Classes/DNBlockHelper.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
#import "native_runtime.h"
9+
#import "DNInterface.h"
1010

1111
NS_ASSUME_NONNULL_BEGIN
1212

0 commit comments

Comments
 (0)