Skip to content

Commit 6935499

Browse files
committed
wip
1 parent 5b99f3b commit 6935499

File tree

13 files changed

+63
-53
lines changed

13 files changed

+63
-53
lines changed

Makefile

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,70 +125,80 @@ xcframework-6-0:
125125
-destination "generic/platform=iOS" \
126126
-archivePath "archives/IssueReportingTestSupport-iOS" \
127127
SKIP_INSTALL=NO \
128-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
128+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
129+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
129130
xcodebuild archive \
130131
-project TestSupport/IssueReportingTestSupport.xcodeproj \
131132
-scheme IssueReportingTestSupport \
132133
-destination "generic/platform=iOS Simulator" \
133134
-archivePath "archives/IssueReportingTestSupport-iOS_Simulator" \
134135
SKIP_INSTALL=NO \
135-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
136+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
137+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
136138
xcodebuild archive \
137139
-project TestSupport/IssueReportingTestSupport.xcodeproj \
138140
-scheme IssueReportingTestSupport \
139141
-destination "generic/platform=macOS" \
140142
-archivePath "archives/IssueReportingTestSupport-macOS" \
141143
SKIP_INSTALL=NO \
142-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
144+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
145+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
143146
xcodebuild archive \
144147
-project TestSupport/IssueReportingTestSupport.xcodeproj \
145148
-scheme IssueReportingTestSupport \
146149
-destination "generic/platform=macOS,variant=Mac Catalyst" \
147150
-archivePath "archives/IssueReportingTestSupport-Mac_Catalyst" \
148151
SKIP_INSTALL=NO \
149-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
152+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
153+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
150154
xcodebuild archive \
151155
-project TestSupport/IssueReportingTestSupport.xcodeproj \
152156
-scheme IssueReportingTestSupport \
153157
-destination "generic/platform=tvOS" \
154158
-archivePath "archives/IssueReportingTestSupport-tvOS" \
155159
SKIP_INSTALL=NO \
156-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
160+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
161+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
157162
xcodebuild archive \
158163
-project TestSupport/IssueReportingTestSupport.xcodeproj \
159164
-scheme IssueReportingTestSupport \
160165
-destination "generic/platform=tvOS Simulator" \
161166
-archivePath "archives/IssueReportingTestSupport-tvOS_Simulator" \
162167
SKIP_INSTALL=NO \
163-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
168+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
169+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
164170
xcodebuild archive \
165171
-project TestSupport/IssueReportingTestSupport.xcodeproj \
166172
-scheme IssueReportingTestSupport \
167173
-destination "generic/platform=visionOS" \
168174
-archivePath "archives/IssueReportingTestSupport-visionOS" \
169175
SKIP_INSTALL=NO \
170-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
176+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
177+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
171178
xcodebuild archive \
172179
-project TestSupport/IssueReportingTestSupport.xcodeproj \
173180
-scheme IssueReportingTestSupport \
174181
-destination "generic/platform=visionOS Simulator" \
175182
-archivePath "archives/IssueReportingTestSupport-visionOS_Simulator" \
176183
SKIP_INSTALL=NO \
177-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
184+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
185+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
178186
xcodebuild archive \
179187
-project TestSupport/IssueReportingTestSupport.xcodeproj \
180188
-scheme IssueReportingTestSupport \
181189
-destination "generic/platform=watchOS" \
182190
-archivePath "archives/IssueReportingTestSupport-watchOS" \
183191
SKIP_INSTALL=NO \
184-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
192+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
193+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
185194
xcodebuild archive \
186195
-project TestSupport/IssueReportingTestSupport.xcodeproj \
187196
-scheme IssueReportingTestSupport \
188197
-destination "generic/platform=watchOS Simulator" \
189198
-archivePath "archives/IssueReportingTestSupport-watchOS_Simulator" \
190199
SKIP_INSTALL=NO \
191-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
200+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
201+
OTHER_LDFLAGS="-weak_framework Testing $$(inherited)"
192202
xcodebuild -create-xcframework \
193203
-framework archives/IssueReportingTestSupport-iOS.xcarchive/Products/Library/Frameworks/IssueReportingTestSupport.framework \
194204
-framework archives/IssueReportingTestSupport-iOS_Simulator.xcarchive/Products/Library/Frameworks/IssueReportingTestSupport.framework \

Sources/IssueReportingTestSupport.600.xcframework/Info.plist

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,69 +6,70 @@
66
<array>
77
<dict>
88
<key>BinaryPath</key>
9-
<string>IssueReportingTestSupport.framework/Versions/A/IssueReportingTestSupport</string>
9+
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
1010
<key>LibraryIdentifier</key>
11-
<string>macos-arm64_x86_64</string>
11+
<string>ios-arm64</string>
1212
<key>LibraryPath</key>
1313
<string>IssueReportingTestSupport.framework</string>
1414
<key>SupportedArchitectures</key>
1515
<array>
1616
<string>arm64</string>
17-
<string>x86_64</string>
1817
</array>
1918
<key>SupportedPlatform</key>
20-
<string>macos</string>
19+
<string>ios</string>
2120
</dict>
2221
<dict>
2322
<key>BinaryPath</key>
2423
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
2524
<key>LibraryIdentifier</key>
26-
<string>ios-arm64</string>
25+
<string>watchos-arm64_arm64_32_armv7k</string>
2726
<key>LibraryPath</key>
2827
<string>IssueReportingTestSupport.framework</string>
2928
<key>SupportedArchitectures</key>
3029
<array>
3130
<string>arm64</string>
31+
<string>arm64_32</string>
32+
<string>armv7k</string>
3233
</array>
3334
<key>SupportedPlatform</key>
34-
<string>ios</string>
35+
<string>watchos</string>
3536
</dict>
3637
<dict>
3738
<key>BinaryPath</key>
3839
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
3940
<key>LibraryIdentifier</key>
40-
<string>tvos-arm64</string>
41+
<string>tvos-arm64_x86_64-simulator</string>
4142
<key>LibraryPath</key>
4243
<string>IssueReportingTestSupport.framework</string>
4344
<key>SupportedArchitectures</key>
4445
<array>
4546
<string>arm64</string>
47+
<string>x86_64</string>
4648
</array>
4749
<key>SupportedPlatform</key>
4850
<string>tvos</string>
51+
<key>SupportedPlatformVariant</key>
52+
<string>simulator</string>
4953
</dict>
5054
<dict>
5155
<key>BinaryPath</key>
52-
<string>IssueReportingTestSupport.framework/Versions/A/IssueReportingTestSupport</string>
56+
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
5357
<key>LibraryIdentifier</key>
54-
<string>ios-arm64_x86_64-maccatalyst</string>
58+
<string>xros-arm64</string>
5559
<key>LibraryPath</key>
5660
<string>IssueReportingTestSupport.framework</string>
5761
<key>SupportedArchitectures</key>
5862
<array>
5963
<string>arm64</string>
60-
<string>x86_64</string>
6164
</array>
6265
<key>SupportedPlatform</key>
63-
<string>ios</string>
64-
<key>SupportedPlatformVariant</key>
65-
<string>maccatalyst</string>
66+
<string>xros</string>
6667
</dict>
6768
<dict>
6869
<key>BinaryPath</key>
6970
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
7071
<key>LibraryIdentifier</key>
71-
<string>xros-arm64_x86_64-simulator</string>
72+
<string>ios-arm64_x86_64-simulator</string>
7273
<key>LibraryPath</key>
7374
<string>IssueReportingTestSupport.framework</string>
7475
<key>SupportedArchitectures</key>
@@ -77,31 +78,32 @@
7778
<string>x86_64</string>
7879
</array>
7980
<key>SupportedPlatform</key>
80-
<string>xros</string>
81+
<string>ios</string>
8182
<key>SupportedPlatformVariant</key>
8283
<string>simulator</string>
8384
</dict>
8485
<dict>
8586
<key>BinaryPath</key>
86-
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
87+
<string>IssueReportingTestSupport.framework/Versions/A/IssueReportingTestSupport</string>
8788
<key>LibraryIdentifier</key>
88-
<string>watchos-arm64_arm64_32_armv7k</string>
89+
<string>ios-arm64_x86_64-maccatalyst</string>
8990
<key>LibraryPath</key>
9091
<string>IssueReportingTestSupport.framework</string>
9192
<key>SupportedArchitectures</key>
9293
<array>
9394
<string>arm64</string>
94-
<string>arm64_32</string>
95-
<string>armv7k</string>
95+
<string>x86_64</string>
9696
</array>
9797
<key>SupportedPlatform</key>
98-
<string>watchos</string>
98+
<string>ios</string>
99+
<key>SupportedPlatformVariant</key>
100+
<string>maccatalyst</string>
99101
</dict>
100102
<dict>
101103
<key>BinaryPath</key>
102-
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
104+
<string>IssueReportingTestSupport.framework/Versions/A/IssueReportingTestSupport</string>
103105
<key>LibraryIdentifier</key>
104-
<string>tvos-arm64_x86_64-simulator</string>
106+
<string>macos-arm64_x86_64</string>
105107
<key>LibraryPath</key>
106108
<string>IssueReportingTestSupport.framework</string>
107109
<key>SupportedArchitectures</key>
@@ -110,46 +112,44 @@
110112
<string>x86_64</string>
111113
</array>
112114
<key>SupportedPlatform</key>
113-
<string>tvos</string>
114-
<key>SupportedPlatformVariant</key>
115-
<string>simulator</string>
115+
<string>macos</string>
116116
</dict>
117117
<dict>
118118
<key>BinaryPath</key>
119119
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
120120
<key>LibraryIdentifier</key>
121-
<string>xros-arm64</string>
121+
<string>xros-arm64_x86_64-simulator</string>
122122
<key>LibraryPath</key>
123123
<string>IssueReportingTestSupport.framework</string>
124124
<key>SupportedArchitectures</key>
125125
<array>
126126
<string>arm64</string>
127+
<string>x86_64</string>
127128
</array>
128129
<key>SupportedPlatform</key>
129130
<string>xros</string>
131+
<key>SupportedPlatformVariant</key>
132+
<string>simulator</string>
130133
</dict>
131134
<dict>
132135
<key>BinaryPath</key>
133136
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
134137
<key>LibraryIdentifier</key>
135-
<string>watchos-arm64_x86_64-simulator</string>
138+
<string>tvos-arm64</string>
136139
<key>LibraryPath</key>
137140
<string>IssueReportingTestSupport.framework</string>
138141
<key>SupportedArchitectures</key>
139142
<array>
140143
<string>arm64</string>
141-
<string>x86_64</string>
142144
</array>
143145
<key>SupportedPlatform</key>
144-
<string>watchos</string>
145-
<key>SupportedPlatformVariant</key>
146-
<string>simulator</string>
146+
<string>tvos</string>
147147
</dict>
148148
<dict>
149149
<key>BinaryPath</key>
150150
<string>IssueReportingTestSupport.framework/IssueReportingTestSupport</string>
151151
<key>LibraryIdentifier</key>
152-
<string>ios-arm64_x86_64-simulator</string>
152+
<string>watchos-arm64_x86_64-simulator</string>
153153
<key>LibraryPath</key>
154154
<string>IssueReportingTestSupport.framework</string>
155155
<key>SupportedArchitectures</key>
@@ -158,7 +158,7 @@
158158
<string>x86_64</string>
159159
</array>
160160
<key>SupportedPlatform</key>
161-
<string>ios</string>
161+
<string>watchos</string>
162162
<key>SupportedPlatformVariant</key>
163163
<string>simulator</string>
164164
</dict>

0 commit comments

Comments
 (0)