Skip to content

Commit 0e98205

Browse files
committed
fixup cocoa ffigen dependency
1 parent 84d609c commit 0e98205

File tree

2 files changed

+100
-78
lines changed

2 files changed

+100
-78
lines changed

flutter/lib/src/sentry_cocoa.dart

+97-77
Original file line numberDiff line numberDiff line change
@@ -23597,17 +23597,17 @@ class SentryCocoa {
2359723597
'objc_msgSend');
2359823598
late final __objc_msgSend_831 = __objc_msgSend_831Ptr.asFunction<
2359923599
ffi.Pointer<
23600-
ffi.NativeFunction<
23601-
ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
23600+
ffi
23601+
.NativeFunction<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
2360223602
Function(ffi.Pointer<ObjCObject>, ffi.Pointer<ObjCSel>)>();
2360323603

2360423604
late final _sel_setSizeFunction_1 = _registerName1("setSizeFunction:");
2360523605
void _objc_msgSend_832(
2360623606
ffi.Pointer<ObjCObject> obj,
2360723607
ffi.Pointer<ObjCSel> sel,
2360823608
ffi.Pointer<
23609-
ffi.NativeFunction<
23610-
ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
23609+
ffi
23610+
.NativeFunction<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
2361123611
value,
2361223612
) {
2361323613
return __objc_msgSend_832(
@@ -36938,19 +36938,20 @@ class ObjCBlock1 extends _ObjCBlockBase {
3693836938
SentryCocoa lib,
3693936939
ffi.Pointer<
3694036940
ffi.NativeFunction<
36941-
ffi.Void Function(
36942-
ffi.UnsignedLong arg0, ffi.Pointer<ffi.Bool> arg1)>>
36941+
ffi.Void Function(ffi.UnsignedLong arg0,
36942+
ffi.Pointer<ffi.Bool> arg1)>>
3694336943
ptr)
3694436944
: this._(
36945-
lib._newBlock1(
36946-
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
36947-
ffi.Void Function(
36948-
ffi.Pointer<_ObjCBlock> block,
36949-
ffi.UnsignedLong arg0,
36950-
ffi.Pointer<ffi.Bool> arg1)>(
36951-
_ObjCBlock1_fnPtrTrampoline)
36952-
.cast(),
36953-
ptr.cast()),
36945+
lib
36946+
._newBlock1(
36947+
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
36948+
ffi.Void Function(
36949+
ffi.Pointer<_ObjCBlock> block,
36950+
ffi.UnsignedLong arg0,
36951+
ffi.Pointer<ffi.Bool> arg1)>(
36952+
_ObjCBlock1_fnPtrTrampoline)
36953+
.cast(),
36954+
ptr.cast()),
3695436955
lib);
3695536956
static ffi.Pointer<ffi.Void>? _cFuncTrampoline;
3695636957

@@ -37351,7 +37352,8 @@ class ObjCBlock6 extends _ObjCBlockBase {
3735137352
ObjCBlock6.fromFunctionPointer(
3735237353
SentryCocoa lib,
3735337354
ffi.Pointer<
37354-
ffi.NativeFunction<
37355+
ffi
37356+
.NativeFunction<
3735537357
ffi.Int32 Function(ffi.Pointer<ObjCObject> arg0,
3735637358
ffi.Pointer<ObjCObject> arg1)>>
3735737359
ptr)
@@ -38439,19 +38441,26 @@ class ObjCBlock10 extends _ObjCBlockBase {
3843938441
/// Creates a block from a C function pointer.
3844038442
ObjCBlock10.fromFunctionPointer(
3844138443
SentryCocoa lib,
38442-
ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ObjCObject> arg0, ffi.Pointer<ObjCObject> arg1, ffi.Pointer<ffi.Bool> arg2)>>
38444+
ffi.Pointer<
38445+
ffi
38446+
.NativeFunction<
38447+
ffi.Bool Function(
38448+
ffi.Pointer<ObjCObject> arg0,
38449+
ffi.Pointer<ObjCObject> arg1,
38450+
ffi.Pointer<ffi.Bool> arg2)>>
3844338451
ptr)
3844438452
: this._(
38445-
lib._newBlock1(
38446-
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
38447-
ffi.Bool Function(
38448-
ffi.Pointer<_ObjCBlock> block,
38449-
ffi.Pointer<ObjCObject> arg0,
38450-
ffi.Pointer<ObjCObject> arg1,
38451-
ffi.Pointer<ffi.Bool> arg2)>(
38452-
_ObjCBlock10_fnPtrTrampoline, false)
38453-
.cast(),
38454-
ptr.cast()),
38453+
lib
38454+
._newBlock1(
38455+
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
38456+
ffi.Bool Function(
38457+
ffi.Pointer<_ObjCBlock> block,
38458+
ffi.Pointer<ObjCObject> arg0,
38459+
ffi.Pointer<ObjCObject> arg1,
38460+
ffi.Pointer<ffi.Bool> arg2)>(
38461+
_ObjCBlock10_fnPtrTrampoline, false)
38462+
.cast(),
38463+
ptr.cast()),
3845538464
lib);
3845638465
static ffi.Pointer<ffi.Void>? _cFuncTrampoline;
3845738466

@@ -40734,19 +40743,20 @@ class ObjCBlock12 extends _ObjCBlockBase {
4073440743
SentryCocoa lib,
4073540744
ffi.Pointer<
4073640745
ffi.NativeFunction<
40737-
ffi.Void Function(
40738-
ffi.Pointer<ffi.Void> arg0, ffi.UnsignedLong arg1)>>
40746+
ffi.Void Function(ffi.Pointer<ffi.Void> arg0,
40747+
ffi.UnsignedLong arg1)>>
4073940748
ptr)
4074040749
: this._(
40741-
lib._newBlock1(
40742-
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
40743-
ffi.Void Function(
40744-
ffi.Pointer<_ObjCBlock> block,
40745-
ffi.Pointer<ffi.Void> arg0,
40746-
ffi.UnsignedLong arg1)>(
40747-
_ObjCBlock12_fnPtrTrampoline)
40748-
.cast(),
40749-
ptr.cast()),
40750+
lib
40751+
._newBlock1(
40752+
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
40753+
ffi.Void Function(
40754+
ffi.Pointer<_ObjCBlock> block,
40755+
ffi.Pointer<ffi.Void> arg0,
40756+
ffi.UnsignedLong arg1)>(
40757+
_ObjCBlock12_fnPtrTrampoline)
40758+
.cast(),
40759+
ptr.cast()),
4075040760
lib);
4075140761
static ffi.Pointer<ffi.Void>? _cFuncTrampoline;
4075240762

@@ -41412,18 +41422,23 @@ class ObjCBlock17 extends _ObjCBlockBase {
4141241422
/// Creates a block from a C function pointer.
4141341423
ObjCBlock17.fromFunctionPointer(
4141441424
SentryCocoa lib,
41415-
ffi.Pointer<ffi.NativeFunction<ffi.Bool Function(ffi.Pointer<ObjCObject> arg0, ffi.Pointer<ffi.Bool> arg1)>>
41425+
ffi.Pointer<
41426+
ffi
41427+
.NativeFunction<
41428+
ffi.Bool Function(ffi.Pointer<ObjCObject> arg0,
41429+
ffi.Pointer<ffi.Bool> arg1)>>
4141641430
ptr)
4141741431
: this._(
41418-
lib._newBlock1(
41419-
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
41420-
ffi.Bool Function(
41421-
ffi.Pointer<_ObjCBlock> block,
41422-
ffi.Pointer<ObjCObject> arg0,
41423-
ffi.Pointer<ffi.Bool> arg1)>(
41424-
_ObjCBlock17_fnPtrTrampoline, false)
41425-
.cast(),
41426-
ptr.cast()),
41432+
lib
41433+
._newBlock1(
41434+
_cFuncTrampoline ??= ffi.Pointer.fromFunction<
41435+
ffi.Bool Function(
41436+
ffi.Pointer<_ObjCBlock> block,
41437+
ffi.Pointer<ObjCObject> arg0,
41438+
ffi.Pointer<ffi.Bool> arg1)>(
41439+
_ObjCBlock17_fnPtrTrampoline, false)
41440+
.cast(),
41441+
ptr.cast()),
4142741442
lib);
4142841443
static ffi.Pointer<ffi.Void>? _cFuncTrampoline;
4142941444

@@ -42184,8 +42199,8 @@ class ObjCBlock18 extends _ObjCBlockBase {
4218442199
ObjCBlock18.fromFunctionPointer(
4218542200
SentryCocoa lib,
4218642201
ffi.Pointer<
42187-
ffi.NativeFunction<
42188-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
42202+
ffi
42203+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
4218942204
ptr)
4219042205
: this._(
4219142206
lib._newBlock1(
@@ -44805,8 +44820,8 @@ class ObjCBlock21 extends _ObjCBlockBase {
4480544820
void call() {
4480644821
return _id.ref.invoke
4480744822
.cast<
44808-
ffi.NativeFunction<
44809-
ffi.Void Function(ffi.Pointer<_ObjCBlock> block)>>()
44823+
ffi
44824+
.NativeFunction<ffi.Void Function(ffi.Pointer<_ObjCBlock> block)>>()
4481044825
.asFunction<void Function(ffi.Pointer<_ObjCBlock> block)>()(_id);
4481144826
}
4481244827
}
@@ -46087,8 +46102,8 @@ class ObjCBlock22 extends _ObjCBlockBase {
4608746102
ObjCBlock22.fromFunctionPointer(
4608846103
SentryCocoa lib,
4608946104
ffi.Pointer<
46090-
ffi.NativeFunction<
46091-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
46105+
ffi
46106+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
4609246107
ptr)
4609346108
: this._(
4609446109
lib._newBlock1(
@@ -49846,7 +49861,8 @@ class ObjCBlock31 extends _ObjCBlockBase {
4984649861
ObjCBlock31.fromFunctionPointer(
4984749862
SentryCocoa lib,
4984849863
ffi.Pointer<
49849-
ffi.NativeFunction<
49864+
ffi
49865+
.NativeFunction<
4985049866
ffi.Void Function(
4985149867
ffi.Pointer<_ObjCBlock> arg0,
4985249868
ffi.Pointer<ObjCObject> arg1,
@@ -55633,8 +55649,8 @@ class ObjCBlock35 extends _ObjCBlockBase {
5563355649
ObjCBlock35.fromFunctionPointer(
5563455650
SentryCocoa lib,
5563555651
ffi.Pointer<
55636-
ffi.NativeFunction<
55637-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
55652+
ffi
55653+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
5563855654
ptr)
5563955655
: this._(
5564055656
lib._newBlock1(
@@ -57575,8 +57591,8 @@ class ObjCBlock36 extends _ObjCBlockBase {
5757557591
ObjCBlock36.fromFunctionPointer(
5757657592
SentryCocoa lib,
5757757593
ffi.Pointer<
57578-
ffi.NativeFunction<
57579-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
57594+
ffi
57595+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
5758057596
ptr)
5758157597
: this._(
5758257598
lib._newBlock1(
@@ -59014,8 +59030,8 @@ class NSPointerFunctions extends NSObject {
5901459030

5901559031
set sizeFunction(
5901659032
ffi.Pointer<
59017-
ffi.NativeFunction<
59018-
ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
59033+
ffi
59034+
.NativeFunction<ffi.UnsignedLong Function(ffi.Pointer<ffi.Void>)>>
5901959035
value) {
5902059036
_lib._objc_msgSend_832(_id, _lib._sel_setSizeFunction_1, value);
5902159037
}
@@ -60830,8 +60846,8 @@ class ObjCBlock39 extends _ObjCBlockBase {
6083060846
ObjCBlock39.fromFunctionPointer(
6083160847
SentryCocoa lib,
6083260848
ffi.Pointer<
60833-
ffi.NativeFunction<
60834-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
60849+
ffi
60850+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
6083560851
ptr)
6083660852
: this._(
6083760853
lib._newBlock1(
@@ -61118,7 +61134,8 @@ class ObjCBlock40 extends _ObjCBlockBase {
6111861134
ObjCBlock40.fromFunctionPointer(
6111961135
SentryCocoa lib,
6112061136
ffi.Pointer<
61121-
ffi.NativeFunction<
61137+
ffi
61138+
.NativeFunction<
6112261139
ffi.Void Function(
6112361140
ffi.Pointer<ObjCObject> arg0,
6112461141
ffi.Pointer<ObjCObject> arg1,
@@ -61843,8 +61860,8 @@ class ObjCBlock41 extends _ObjCBlockBase {
6184361860
ObjCBlock41.fromFunctionPointer(
6184461861
SentryCocoa lib,
6184561862
ffi.Pointer<
61846-
ffi.NativeFunction<
61847-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
61863+
ffi
61864+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
6184861865
ptr)
6184961866
: this._(
6185061867
lib._newBlock1(
@@ -61912,8 +61929,8 @@ class ObjCBlock42 extends _ObjCBlockBase {
6191261929
ObjCBlock42.fromFunctionPointer(
6191361930
SentryCocoa lib,
6191461931
ffi.Pointer<
61915-
ffi.NativeFunction<
61916-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
61932+
ffi
61933+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
6191761934
ptr)
6191861935
: this._(
6191961936
lib._newBlock1(
@@ -63931,7 +63948,8 @@ class ObjCBlock43 extends _ObjCBlockBase {
6393163948
ObjCBlock43.fromFunctionPointer(
6393263949
SentryCocoa lib,
6393363950
ffi.Pointer<
63934-
ffi.NativeFunction<
63951+
ffi
63952+
.NativeFunction<
6393563953
ffi.Void Function(
6393663954
ffi.Pointer<ObjCObject> arg0,
6393763955
ffi.Pointer<ObjCObject> arg1,
@@ -64246,8 +64264,8 @@ class ObjCBlock44 extends _ObjCBlockBase {
6424664264
ObjCBlock44.fromFunctionPointer(
6424764265
SentryCocoa lib,
6424864266
ffi.Pointer<
64249-
ffi.NativeFunction<
64250-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
64267+
ffi
64268+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
6425164269
ptr)
6425264270
: this._(
6425364271
lib._newBlock1(
@@ -65244,7 +65262,8 @@ class ObjCBlock47 extends _ObjCBlockBase {
6524465262
ObjCBlock47.fromFunctionPointer(
6524565263
SentryCocoa lib,
6524665264
ffi.Pointer<
65247-
ffi.NativeFunction<
65265+
ffi
65266+
.NativeFunction<
6524865267
ffi.Void Function(
6524965268
ffi.Pointer<ObjCObject> arg0,
6525065269
ffi.Pointer<ObjCObject> arg1,
@@ -65347,7 +65366,8 @@ class ObjCBlock48 extends _ObjCBlockBase {
6534765366
ObjCBlock48.fromFunctionPointer(
6534865367
SentryCocoa lib,
6534965368
ffi.Pointer<
65350-
ffi.NativeFunction<
65369+
ffi
65370+
.NativeFunction<
6535165371
ffi.Void Function(
6535265372
ffi.Pointer<ObjCObject> arg0,
6535365373
ffi.Pointer<ObjCObject> arg1,
@@ -65804,8 +65824,8 @@ class ObjCBlock49 extends _ObjCBlockBase {
6580465824
ObjCBlock49.fromFunctionPointer(
6580565825
SentryCocoa lib,
6580665826
ffi.Pointer<
65807-
ffi.NativeFunction<
65808-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
65827+
ffi
65828+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
6580965829
ptr)
6581065830
: this._(
6581165831
lib._newBlock1(
@@ -69056,8 +69076,8 @@ class ObjCBlock50 extends _ObjCBlockBase {
6905669076
ObjCBlock50.fromFunctionPointer(
6905769077
SentryCocoa lib,
6905869078
ffi.Pointer<
69059-
ffi.NativeFunction<
69060-
ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
69079+
ffi
69080+
.NativeFunction<ffi.Void Function(ffi.Pointer<ObjCObject> arg0)>>
6906169081
ptr)
6906269082
: this._(
6906369083
lib._newBlock1(

flutter/pubspec.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ dev_dependencies:
2828
yaml: ^3.1.0 # needed for version match (code and pubspec)
2929
flutter_lints: ^2.0.0
3030
ffigen:
31-
path: /Users/ivan/dev/ffigen
31+
git:
32+
url: https://github.com/vaind/ffigen
33+
ref: 4d714b0f2d11e9698a1885ec2d5de15f2ed827f1
3234
jnigen: ^0.5.0
3335

3436
flutter:

0 commit comments

Comments
 (0)