Skip to content

Commit

Permalink
Add repro for XCFramework import issue (#713)
Browse files Browse the repository at this point in the history 
Improve tests to catch issue reported in #712.
  • Loading branch information
@mattrobmattrob
mattrobmattrob authored May 9, 2023
1 parent 5d32bd1 commit 02c80fc
Show file tree
Hide file tree
Showing 30 changed files with 156 additions and 22 deletions.
8 changes: 8 additions & 0 deletions tests/ios/xcframeworks/Basic/BasicXCFramework/BasicXCFramework.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
A723107E296F112D0035D90D /* Foo.swift in Sources */ = {isa = PBXBuildFile; fileRef = A723107C296F112D0035D90D /* Foo.swift */; };
A7231082296F11370035D90D /* BasicXCFrameworkDynamic.h in Headers */ = {isa = PBXBuildFile; fileRef = A7231080296F11370035D90D /* BasicXCFrameworkDynamic.h */; settings = {ATTRIBUTES = (Public, ); }; };
A7231083296F11370035D90D /* Foo.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7231081296F11370035D90D /* Foo.swift */; };
A77FD8AA2A0A9F6300DF2D77 /* Bar.h in Headers */ = {isa = PBXBuildFile; fileRef = A77FD8A92A0A9F6300DF2D77 /* Bar.h */; settings = {ATTRIBUTES = (Public, ); }; };
A77FD8AB2A0A9F6B00DF2D77 /* Bar.h in Headers */ = {isa = PBXBuildFile; fileRef = A77FD8A82A0A9F5400DF2D77 /* Bar.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -20,6 +22,8 @@
A723107C296F112D0035D90D /* Foo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Foo.swift; sourceTree = "<group>"; };
A7231080296F11370035D90D /* BasicXCFrameworkDynamic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BasicXCFrameworkDynamic.h; sourceTree = "<group>"; };
A7231081296F11370035D90D /* Foo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Foo.swift; sourceTree = "<group>"; };
A77FD8A82A0A9F5400DF2D77 /* Bar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Bar.h; sourceTree = "<group>"; };
A77FD8A92A0A9F6300DF2D77 /* Bar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Bar.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -63,6 +67,7 @@
children = (
A723107B296F112D0035D90D /* BasicXCFrameworkStatic.h */,
A723107C296F112D0035D90D /* Foo.swift */,
A77FD8A82A0A9F5400DF2D77 /* Bar.h */,
);
path = BasicXCFrameworkStatic;
sourceTree = "<group>";
Expand All @@ -72,6 +77,7 @@
children = (
A7231080296F11370035D90D /* BasicXCFrameworkDynamic.h */,
A7231081296F11370035D90D /* Foo.swift */,
A77FD8A92A0A9F6300DF2D77 /* Bar.h */,
);
path = BasicXCFrameworkDynamic;
sourceTree = "<group>";
Expand All @@ -83,6 +89,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
A77FD8AA2A0A9F6300DF2D77 /* Bar.h in Headers */,
A7231082296F11370035D90D /* BasicXCFrameworkDynamic.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -91,6 +98,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
A77FD8AB2A0A9F6B00DF2D77 /* Bar.h in Headers */,
A723107D296F112D0035D90D /* BasicXCFrameworkStatic.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Binary file modified ...rkDynamic.xcframework/ios-arm64/BasicXCFrameworkDynamic.framework/BasicXCFrameworkDynamic
View file
Binary file not shown.
11 changes: 11 additions & 0 deletions ...cXCFrameworkDynamic.xcframework/ios-arm64/BasicXCFrameworkDynamic.framework/Headers/Bar.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Bar.h
// BasicXCFrameworkDynamic
//
// Created by Matt Robinson on 5/9/23.
//

typedef NS_OPTIONS(NSInteger, DynamicXCFrameworkType) {
DynamicXCFrameworkTypeFoo = 1 << 1,
DynamicXCFrameworkTypeBar = 1 << 1,
};
2 changes: 1 addition & 1 deletion ...xcframework/ios-arm64/BasicXCFrameworkDynamic.framework/Headers/BasicXCFrameworkDynamic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ FOUNDATION_EXPORT const unsigned char BasicXCFrameworkVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <BasicXCFramework/PublicHeader.h>


#import "Bar.h"
Binary file modified ...asicXCFrameworkDynamic.xcframework/ios-arm64/BasicXCFrameworkDynamic.framework/Info.plist
View file
Binary file not shown.
23 changes: 19 additions & 4 deletions ...amic.xcframework/ios-arm64/BasicXCFrameworkDynamic.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@
<dict>
<key>files</key>
<dict>
<key>Headers/Bar.h</key>
<data>
E/AKOA/yEdAzMuDQ0pGNEqLWzio=
</data>
<key>Headers/BasicXCFrameworkDynamic-Swift.h</key>
<data>
xT9czTu23R9CY/8KqwPtd7c6IbQ=
</data>
<key>Headers/BasicXCFrameworkDynamic.h</key>
<data>
UTB4W/2rKrZg1Y3vmfQORhiUJTo=
MvRdcNiDaKmhGVQLAaZvlBoFAT8=
</data>
<key>Info.plist</key>
<data>
jddBDbclyx2Du5eKzp1yShaNjsE=
oo68NZ39TH4wIDGvmmmi+NDmLRs=
</data>
<key>Modules/BasicXCFrameworkDynamic.swiftmodule/arm64-apple-ios.abi.json</key>
<data>
Expand Down Expand Up @@ -43,6 +47,17 @@
</dict>
<key>files2</key>
<dict>
<key>Headers/Bar.h</key>
<dict>
<key>hash</key>
<data>
E/AKOA/yEdAzMuDQ0pGNEqLWzio=
</data>
<key>hash2</key>
<data>
lhYIUEFkJ9FNFNxRhv/8Wsp1Y6eeqLnEzGpVFcYkfq0=
</data>
</dict>
<key>Headers/BasicXCFrameworkDynamic-Swift.h</key>
<dict>
<key>hash</key>
Expand All @@ -58,11 +73,11 @@
<dict>
<key>hash</key>
<data>
UTB4W/2rKrZg1Y3vmfQORhiUJTo=
MvRdcNiDaKmhGVQLAaZvlBoFAT8=
</data>
<key>hash2</key>
<data>
wt0HRmlH8pm9M2X7/7csMSGiN6Im+d4km9tfEpl/qKQ=
W3+S0sGtg4eVKZIWN0rh6Sj/z+zHacdS4eMUbwSaA04=
</data>
</dict>
<key>Modules/BasicXCFrameworkDynamic.swiftmodule/arm64-apple-ios.abi.json</key>
Expand Down
Binary file modified ...work/ios-arm64_x86_64-simulator/BasicXCFrameworkDynamic.framework/BasicXCFrameworkDynamic
View file
Binary file not shown.
11 changes: 11 additions & 0 deletions ...ic.xcframework/ios-arm64_x86_64-simulator/BasicXCFrameworkDynamic.framework/Headers/Bar.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Bar.h
// BasicXCFrameworkDynamic
//
// Created by Matt Robinson on 5/9/23.
//

typedef NS_OPTIONS(NSInteger, DynamicXCFrameworkType) {
DynamicXCFrameworkTypeFoo = 1 << 1,
DynamicXCFrameworkTypeBar = 1 << 1,
};
2 changes: 1 addition & 1 deletion ...rm64_x86_64-simulator/BasicXCFrameworkDynamic.framework/Headers/BasicXCFrameworkDynamic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ FOUNDATION_EXPORT const unsigned char BasicXCFrameworkVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <BasicXCFramework/PublicHeader.h>


#import "Bar.h"
Binary file modified ...namic.xcframework/ios-arm64_x86_64-simulator/BasicXCFrameworkDynamic.framework/Info.plist
View file
Binary file not shown.
23 changes: 19 additions & 4 deletions ...ios-arm64_x86_64-simulator/BasicXCFrameworkDynamic.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@
<dict>
<key>files</key>
<dict>
<key>Headers/Bar.h</key>
<data>
E/AKOA/yEdAzMuDQ0pGNEqLWzio=
</data>
<key>Headers/BasicXCFrameworkDynamic-Swift.h</key>
<data>
uYjDGdtWZX7kslm5sDFkg7xUSO0=
</data>
<key>Headers/BasicXCFrameworkDynamic.h</key>
<data>
UTB4W/2rKrZg1Y3vmfQORhiUJTo=
MvRdcNiDaKmhGVQLAaZvlBoFAT8=
</data>
<key>Info.plist</key>
<data>
Yw+oSHxacOux//XRfuGnF0eMCT8=
PxQTVtGYnmEVSra7MDFltdDKvz4=
</data>
<key>Modules/BasicXCFrameworkDynamic.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
<data>
Expand Down Expand Up @@ -63,6 +67,17 @@
</dict>
<key>files2</key>
<dict>
<key>Headers/Bar.h</key>
<dict>
<key>hash</key>
<data>
E/AKOA/yEdAzMuDQ0pGNEqLWzio=
</data>
<key>hash2</key>
<data>
lhYIUEFkJ9FNFNxRhv/8Wsp1Y6eeqLnEzGpVFcYkfq0=
</data>
</dict>
<key>Headers/BasicXCFrameworkDynamic-Swift.h</key>
<dict>
<key>hash</key>
Expand All @@ -78,11 +93,11 @@
<dict>
<key>hash</key>
<data>
UTB4W/2rKrZg1Y3vmfQORhiUJTo=
MvRdcNiDaKmhGVQLAaZvlBoFAT8=
</data>
<key>hash2</key>
<data>
wt0HRmlH8pm9M2X7/7csMSGiN6Im+d4km9tfEpl/qKQ=
W3+S0sGtg4eVKZIWN0rh6Sj/z+zHacdS4eMUbwSaA04=
</data>
</dict>
<key>Modules/BasicXCFrameworkDynamic.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
Expand Down
11 changes: 11 additions & 0 deletions tests/ios/xcframeworks/Basic/BasicXCFramework/BasicXCFrameworkDynamic/Bar.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Bar.h
// BasicXCFrameworkDynamic
//
// Created by Matt Robinson on 5/9/23.
//

typedef NS_OPTIONS(NSInteger, DynamicXCFrameworkType) {
DynamicXCFrameworkTypeFoo = 1 << 1,
DynamicXCFrameworkTypeBar = 1 << 1,
};
2 changes: 1 addition & 1 deletion ...ios/xcframeworks/Basic/BasicXCFramework/BasicXCFrameworkDynamic/BasicXCFrameworkDynamic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ FOUNDATION_EXPORT const unsigned char BasicXCFrameworkVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <BasicXCFramework/PublicHeader.h>


#import "Bar.h"
Binary file modified ...eworkStatic.xcframework/ios-arm64/BasicXCFrameworkStatic.framework/BasicXCFrameworkStatic
View file
Binary file not shown.
11 changes: 11 additions & 0 deletions ...sicXCFrameworkStatic.xcframework/ios-arm64/BasicXCFrameworkStatic.framework/Headers/Bar.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Bar.h
// BasicXCFramework
//
// Created by Matt Robinson on 5/9/23.
//

typedef NS_OPTIONS(NSInteger, StaticXCFrameworkType) {
StaticXCFrameworkTypeFoo = 1 << 1,
StaticXCFrameworkTypeBar = 1 << 1,
};
2 changes: 1 addition & 1 deletion ...c.xcframework/ios-arm64/BasicXCFrameworkStatic.framework/Headers/BasicXCFrameworkStatic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ FOUNDATION_EXPORT const unsigned char BasicXCFrameworkVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <BasicXCFramework/PublicHeader.h>


#import "Bar.h"
Binary file modified .../BasicXCFrameworkStatic.xcframework/ios-arm64/BasicXCFrameworkStatic.framework/Info.plist
View file
Binary file not shown.
Binary file modified ...tatic.xcframework/ios-arm64/BasicXCFrameworkStatic.framework/_CodeSignature/CodeDirectory
View file
Binary file not shown.
Binary file modified ....xcframework/ios-arm64/BasicXCFrameworkStatic.framework/_CodeSignature/CodeRequirements-1
View file
Binary file not shown.
23 changes: 19 additions & 4 deletions ...tatic.xcframework/ios-arm64/BasicXCFrameworkStatic.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@
<dict>
<key>files</key>
<dict>
<key>Headers/Bar.h</key>
<data>
k+VOkHyoRhupUo9/JBH6M5g9qpA=
</data>
<key>Headers/BasicXCFrameworkStatic-Swift.h</key>
<data>
rczl862K7Ia/qhVQmDVm6+O9txE=
</data>
<key>Headers/BasicXCFrameworkStatic.h</key>
<data>
UTB4W/2rKrZg1Y3vmfQORhiUJTo=
MvRdcNiDaKmhGVQLAaZvlBoFAT8=
</data>
<key>Info.plist</key>
<data>
acHzzR6BkqvaQeUEbWVvaEJeWFA=
5tW2VvwMu5vJHC4QpPr8T/L503Q=
</data>
<key>Modules/BasicXCFrameworkStatic.swiftmodule/arm64-apple-ios.abi.json</key>
<data>
Expand Down Expand Up @@ -43,6 +47,17 @@
</dict>
<key>files2</key>
<dict>
<key>Headers/Bar.h</key>
<dict>
<key>hash</key>
<data>
k+VOkHyoRhupUo9/JBH6M5g9qpA=
</data>
<key>hash2</key>
<data>
Dz/25ldAIlCIpVLfD+DEYWW/1Rd49y9zs0EMJMujLa8=
</data>
</dict>
<key>Headers/BasicXCFrameworkStatic-Swift.h</key>
<dict>
<key>hash</key>
Expand All @@ -58,11 +73,11 @@
<dict>
<key>hash</key>
<data>
UTB4W/2rKrZg1Y3vmfQORhiUJTo=
MvRdcNiDaKmhGVQLAaZvlBoFAT8=
</data>
<key>hash2</key>
<data>
wt0HRmlH8pm9M2X7/7csMSGiN6Im+d4km9tfEpl/qKQ=
W3+S0sGtg4eVKZIWN0rh6Sj/z+zHacdS4eMUbwSaA04=
</data>
</dict>
<key>Modules/BasicXCFrameworkStatic.swiftmodule/arm64-apple-ios.abi.json</key>
Expand Down
Binary file modified ...tatic.xcframework/ios-arm64/BasicXCFrameworkStatic.framework/_CodeSignature/CodeSignature
View file
Binary file not shown.
Binary file modified ...mework/ios-arm64_x86_64-simulator/BasicXCFrameworkStatic.framework/BasicXCFrameworkStatic
View file
Binary file not shown.
11 changes: 11 additions & 0 deletions ...tic.xcframework/ios-arm64_x86_64-simulator/BasicXCFrameworkStatic.framework/Headers/Bar.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Bar.h
// BasicXCFramework
//
// Created by Matt Robinson on 5/9/23.
//

typedef NS_OPTIONS(NSInteger, StaticXCFrameworkType) {
StaticXCFrameworkTypeFoo = 1 << 1,
StaticXCFrameworkTypeBar = 1 << 1,
};
2 changes: 1 addition & 1 deletion ...-arm64_x86_64-simulator/BasicXCFrameworkStatic.framework/Headers/BasicXCFrameworkStatic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ FOUNDATION_EXPORT const unsigned char BasicXCFrameworkVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <BasicXCFramework/PublicHeader.h>


#import "Bar.h"
Binary file modified ...Static.xcframework/ios-arm64_x86_64-simulator/BasicXCFrameworkStatic.framework/Info.plist
View file
Binary file not shown.
Binary file modified .../ios-arm64_x86_64-simulator/BasicXCFrameworkStatic.framework/_CodeSignature/CodeDirectory
View file
Binary file not shown.
Binary file modified ...arm64_x86_64-simulator/BasicXCFrameworkStatic.framework/_CodeSignature/CodeRequirements-1
View file
Binary file not shown.
23 changes: 19 additions & 4 deletions .../ios-arm64_x86_64-simulator/BasicXCFrameworkStatic.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@
<dict>
<key>files</key>
<dict>
<key>Headers/Bar.h</key>
<data>
k+VOkHyoRhupUo9/JBH6M5g9qpA=
</data>
<key>Headers/BasicXCFrameworkStatic-Swift.h</key>
<data>
GTjTI5xZ7Pz/caplsOtHVK+0uRs=
</data>
<key>Headers/BasicXCFrameworkStatic.h</key>
<data>
UTB4W/2rKrZg1Y3vmfQORhiUJTo=
MvRdcNiDaKmhGVQLAaZvlBoFAT8=
</data>
<key>Info.plist</key>
<data>
yPMIEU/pfVhb2gOiOt/m9ZWFF4M=
YRbJKydvWOlcK7AwaR39MtymMas=
</data>
<key>Modules/BasicXCFrameworkStatic.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
<data>
Expand Down Expand Up @@ -63,6 +67,17 @@
</dict>
<key>files2</key>
<dict>
<key>Headers/Bar.h</key>
<dict>
<key>hash</key>
<data>
k+VOkHyoRhupUo9/JBH6M5g9qpA=
</data>
<key>hash2</key>
<data>
Dz/25ldAIlCIpVLfD+DEYWW/1Rd49y9zs0EMJMujLa8=
</data>
</dict>
<key>Headers/BasicXCFrameworkStatic-Swift.h</key>
<dict>
<key>hash</key>
Expand All @@ -78,11 +93,11 @@
<dict>
<key>hash</key>
<data>
UTB4W/2rKrZg1Y3vmfQORhiUJTo=
MvRdcNiDaKmhGVQLAaZvlBoFAT8=
</data>
<key>hash2</key>
<data>
wt0HRmlH8pm9M2X7/7csMSGiN6Im+d4km9tfEpl/qKQ=
W3+S0sGtg4eVKZIWN0rh6Sj/z+zHacdS4eMUbwSaA04=
</data>
</dict>
<key>Modules/BasicXCFrameworkStatic.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
Expand Down
11 changes: 11 additions & 0 deletions tests/ios/xcframeworks/Basic/BasicXCFramework/BasicXCFrameworkStatic/Bar.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Bar.h
// BasicXCFramework
//
// Created by Matt Robinson on 5/9/23.
//

typedef NS_OPTIONS(NSInteger, StaticXCFrameworkType) {
StaticXCFrameworkTypeFoo = 1 << 1,
StaticXCFrameworkTypeBar = 1 << 1,
};
2 changes: 1 addition & 1 deletion ...s/ios/xcframeworks/Basic/BasicXCFramework/BasicXCFrameworkStatic/BasicXCFrameworkStatic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ FOUNDATION_EXPORT const unsigned char BasicXCFrameworkVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <BasicXCFramework/PublicHeader.h>


#import "Bar.h"

0 comments on commit 02c80fc

Please sign in to comment.