Skip to content

Commit 91d8719

Browse files
authored
Upgrade to package:objective_c 7.0.0 (#1726)
1 parent 001665e commit 91d8719

File tree

12 files changed

+6473
-10268
lines changed

12 files changed

+6473
-10268
lines changed

pkgs/cupertino_http/CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
## 2.0.3-wip
1+
## 2.1.0-wip
22

33
* Remove some unnecessary native code.
4+
* Upgrade to `package:objective_c` 7.0.
5+
* Upgrade to `package:ffigen` 18.0.
6+
* Fix a [bug](https://github.com/dart-lang/http/issues/1702) where
7+
`package:cupertino_http` did not work with `package:firebase_performance`
8+
enabled.
49

510
## 2.0.2
611

pkgs/cupertino_http/darwin/cupertino_http/Sources/cupertino_http/native_cupertino_bindings.m

+544-712
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/cupertino_http/example/integration_test/url_session_configuration_test.dart

+5-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@ void testProperties(URLSessionConfiguration config) {
121121
config.multipathServiceType,
122122
NSURLSessionMultipathServiceType
123123
.NSURLSessionMultipathServiceTypeNone);
124-
});
124+
},
125+
skip: Platform.isMacOS
126+
? 'NSURLSessionConfiguration.multipathServiceType is not '
127+
'supported on macOS'
128+
: false);
125129
test('networkServiceType', () {
126130
expect(config.networkServiceType,
127131
NSURLRequestNetworkServiceType.NSURLNetworkServiceTypeDefault);

pkgs/cupertino_http/example/integration_test/utils_test.dart

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ void main() {
1212

1313
group('stringNSDictionaryToMap', () {
1414
test('empty input', () {
15-
final d = objc.NSMutableDictionary.new1();
15+
final d = objc.NSMutableDictionary();
1616

1717
expect(stringNSDictionaryToMap(d), <String, String>{});
1818
});
1919

2020
test('single string input', () {
21-
final d = objc.NSMutableDictionary.new1()
21+
final d = objc.NSMutableDictionary()
2222
..setObject_forKey_('value'.toNSString(), 'key'.toNSString());
2323

2424
expect(stringNSDictionaryToMap(d), {'key': 'value'});
2525
});
2626

2727
test('multiple string input', () {
28-
final d = objc.NSMutableDictionary.new1()
28+
final d = objc.NSMutableDictionary()
2929
..setObject_forKey_('value1'.toNSString(), 'key1'.toNSString())
3030
..setObject_forKey_('value2'.toNSString(), 'key2'.toNSString())
3131
..setObject_forKey_('value3'.toNSString(), 'key3'.toNSString());
@@ -34,14 +34,14 @@ void main() {
3434
});
3535

3636
test('non-string value', () {
37-
final d = objc.NSMutableDictionary.new1()
37+
final d = objc.NSMutableDictionary()
3838
..setObject_forKey_(
3939
objc.NSNumberCreation.numberWithInteger_(5), 'key'.toNSString());
4040
expect(() => stringNSDictionaryToMap(d), throwsUnsupportedError);
4141
});
4242

4343
test('non-string key', () {
44-
final d = objc.NSMutableDictionary.new1()
44+
final d = objc.NSMutableDictionary()
4545
..setObject_forKey_(
4646
'value'.toNSString(), objc.NSNumberCreation.numberWithInteger_(5));
4747
expect(() => stringNSDictionaryToMap(d), throwsUnsupportedError);
@@ -57,17 +57,17 @@ void main() {
5757
test('single string input', () {
5858
final array = stringIterableToNSArray(['apple']);
5959
expect(array.count, 1);
60-
expect(
61-
objc.NSString.castFrom(array.objectAtIndex_(0)).toString(), 'apple');
60+
expect(objc.NSString.castFrom(array.objectAtIndex_(0)).toDartString(),
61+
'apple');
6262
});
6363

6464
test('multiple string input', () {
6565
final array = stringIterableToNSArray(['apple', 'banana']);
6666
expect(array.count, 2);
67-
expect(
68-
objc.NSString.castFrom(array.objectAtIndex_(0)).toString(), 'apple');
69-
expect(
70-
objc.NSString.castFrom(array.objectAtIndex_(1)).toString(), 'banana');
67+
expect(objc.NSString.castFrom(array.objectAtIndex_(0)).toDartString(),
68+
'apple');
69+
expect(objc.NSString.castFrom(array.objectAtIndex_(1)).toDartString(),
70+
'banana');
7171
});
7272
});
7373
}

pkgs/cupertino_http/example/ios/Podfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ EXTERNAL SOURCES:
2525
:path: ".symlinks/plugins/objective_c/ios"
2626

2727
SPEC CHECKSUMS:
28-
cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
28+
cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
2929
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
30-
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
31-
objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
30+
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
31+
objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
3232

3333
PODFILE CHECKSUM: d2243213672c3c48aae53c36642ba411a6be7309
3434

35-
COCOAPODS: 1.15.2
35+
COCOAPODS: 1.16.2

pkgs/cupertino_http/example/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dev_dependencies:
3131
http_profile: ^0.1.0
3232
integration_test:
3333
sdk: flutter
34-
objective_c: ^4.0.0
34+
objective_c: ^7.0.0
3535
test: ^1.21.1
3636
web_socket_conformance_tests:
3737
path: ../../web_socket_conformance_tests/

0 commit comments

Comments
 (0)