Skip to content

Commit 0a1c19c

Browse files
author
Carlos Cabanero
committed
Extra project package changes to pass validation
1 parent 78856d9 commit 0a1c19c

File tree

3 files changed

+16
-47
lines changed

3 files changed

+16
-47
lines changed

‎Blink.xcodeproj/project.pbxproj

+8-16
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@
197197
BDF2B8D32BC480CC00B9C7EA /* vim.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BDE84C772BB33AD700457391 /* vim.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
198198
BDF2B8D52BC480D100B9C7EA /* xxd.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BDE84C762BB33AB800457391 /* xxd.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
199199
BDF2B8D82BC4820F00B9C7EA /* curl_ios.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BDF2B8D62BC481F000B9C7EA /* curl_ios.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
200+
BDF2B8DD2BC48D2800B9C7EA /* LibSSH.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC425C1C04700385378 /* LibSSH.xcframework */; };
201+
BDF2B8DF2BC48D2D00B9C7EA /* libssh2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F64C9525CA99AD00F2225D /* libssh2.xcframework */; };
200202
BDF471BA268CD17B00A7A41B /* SSH.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07FABB8425C9AEC000E1CC2C /* SSH.framework */; };
201203
C94437571D8311960096F84E /* BKResource.m in Sources */ = {isa = PBXBuildFile; fileRef = C94437561D8311960096F84E /* BKResource.m */; };
202204
C94437601D831CD30096F84E /* Themes in Resources */ = {isa = PBXBuildFile; fileRef = C944375F1D831CD30096F84E /* Themes */; };
@@ -227,7 +229,6 @@
227229
D218069C25CC27C100B98902 /* AppKitBridge.bundle in Embed PlugIns */ = {isa = PBXBuildFile; fileRef = D218068725CC277900B98902 /* AppKitBridge.bundle */; platformFilter = maccatalyst; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
228230
D218072725CD499C00B98902 /* LibSSH.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC425C1C04700385378 /* LibSSH.xcframework */; };
229231
D218073825CD4AF400B98902 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F64C9425CA99AD00F2225D /* openssl.xcframework */; };
230-
D218076325CD4FDC00B98902 /* LibSSH.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC425C1C04700385378 /* LibSSH.xcframework */; };
231232
D21A3FD721943BE200269705 /* dark-settings-ipad-29pt.png in Resources */ = {isa = PBXBuildFile; fileRef = D21A3FC621943BE200269705 /* dark-settings-ipad-29pt.png */; };
232233
D21A3FD821943BE200269705 /* dark-notification-ipad-20pt.png in Resources */ = {isa = PBXBuildFile; fileRef = D21A3FC721943BE200269705 /* dark-notification-ipad-20pt.png */; };
233234
D21A3FD921943BE200269705 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D21A3FC821943BE200269705 /* [email protected] */; };
@@ -288,8 +289,6 @@
288289
D2334EFB25C1C28F00385378 /* network_ios.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC625C1C04700385378 /* network_ios.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
289290
D2334F0025C1C28F00385378 /* shell.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC925C1C04700385378 /* shell.xcframework */; };
290291
D2334F0125C1C28F00385378 /* shell.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC925C1C04700385378 /* shell.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
291-
D2334F0225C1C28F00385378 /* ssh_cmd.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC825C1C04700385378 /* ssh_cmd.xcframework */; };
292-
D2334F0325C1C28F00385378 /* ssh_cmd.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC825C1C04700385378 /* ssh_cmd.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
293292
D2334F0425C1C28F00385378 /* tar.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2334ECD25C1C04700385378 /* tar.xcframework */; };
294293
D2334F0525C1C28F00385378 /* tar.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2334ECD25C1C04700385378 /* tar.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
295294
D2334F0625C1C28F00385378 /* text.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC725C1C04700385378 /* text.xcframework */; };
@@ -464,8 +463,6 @@
464463
D2F330D420A6F1DF0074ADD7 /* clear.m in Sources */ = {isa = PBXBuildFile; fileRef = D2F330D320A6F1DF0074ADD7 /* clear.m */; };
465464
D2F330D620A6F4F50074ADD7 /* history.m in Sources */ = {isa = PBXBuildFile; fileRef = D2F330D520A6F4F50074ADD7 /* history.m */; };
466465
D2F330DA20A7127B0074ADD7 /* open.m in Sources */ = {isa = PBXBuildFile; fileRef = D2F330D920A7127B0074ADD7 /* open.m */; };
467-
D2F64CAF25CAAA3300F2225D /* libssh2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2F64C9525CA99AD00F2225D /* libssh2.xcframework */; };
468-
D2F64CB125CAAAD100F2225D /* ssh_cmd.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2334EC825C1C04700385378 /* ssh_cmd.xcframework */; };
469466
D2FBEC0B27CF505D00FD974A /* browse.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2FBEC0727CF505D00FD974A /* browse.swift */; };
470467
D2FCB4DD2339F9DB00A88108 /* UIScrollView+Paging.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2FCB4DC2339F9DB00A88108 /* UIScrollView+Paging.swift */; };
471468
/* End PBXBuildFile section */
@@ -697,7 +694,6 @@
697694
D2334EF525C1C28F00385378 /* ios_system.xcframework in Embed Frameworks */,
698695
D2334F0525C1C28F00385378 /* tar.xcframework in Embed Frameworks */,
699696
D22277E22A26115300D4C708 /* BlinkSnippets.framework in Embed Frameworks */,
700-
D2334F0325C1C28F00385378 /* ssh_cmd.xcframework in Embed Frameworks */,
701697
D2334EEF25C1C28F00385378 /* awk.xcframework in Embed Frameworks */,
702698
D2A0C2172600D16300F0DF97 /* Protobuf_C_.xcframework in Embed Frameworks */,
703699
D2334EF325C1C28F00385378 /* files.xcframework in Embed Frameworks */,
@@ -1006,7 +1002,6 @@
10061002
D2334EC525C1C04700385378 /* mosh.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mosh.xcframework; path = xcfs/.build/artifacts/xcfs/mosh/mosh.xcframework; sourceTree = SOURCE_ROOT; };
10071003
D2334EC625C1C04700385378 /* network_ios.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = network_ios.xcframework; path = xcfs/.build/artifacts/xcfs/network_ios/network_ios.xcframework; sourceTree = SOURCE_ROOT; };
10081004
D2334EC725C1C04700385378 /* text.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = text.xcframework; path = xcfs/.build/artifacts/xcfs/text/text.xcframework; sourceTree = SOURCE_ROOT; };
1009-
D2334EC825C1C04700385378 /* ssh_cmd.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ssh_cmd.xcframework; path = xcfs/.build/artifacts/xcfs/ssh_cmd/ssh_cmd.xcframework; sourceTree = SOURCE_ROOT; };
10101005
D2334EC925C1C04700385378 /* shell.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = shell.xcframework; path = xcfs/.build/artifacts/xcfs/shell/shell.xcframework; sourceTree = SOURCE_ROOT; };
10111006
D2334ECA25C1C04700385378 /* files.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = files.xcframework; path = xcfs/.build/artifacts/xcfs/files/files.xcframework; sourceTree = SOURCE_ROOT; };
10121007
D2334ECB25C1C04700385378 /* Protobuf_C_.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Protobuf_C_.xcframework; path = xcfs/.build/artifacts/xcfs/Protobuf_C_/Protobuf_C_.xcframework; sourceTree = SOURCE_ROOT; };
@@ -1319,19 +1314,17 @@
13191314
files = (
13201315
D222780A2A26216900D4C708 /* TreeSitterBashQueries in Frameworks */,
13211316
D28DB3AC210B110C008A1139 /* libcompression.tbd in Frameworks */,
1322-
D2334F0225C1C28F00385378 /* ssh_cmd.xcframework in Frameworks */,
1317+
BDF2B8DF2BC48D2D00B9C7EA /* libssh2.xcframework in Frameworks */,
13231318
D2334F0625C1C28F00385378 /* text.xcframework in Frameworks */,
13241319
07FABB9925C9AEC100E1CC2C /* SSH.framework in Frameworks */,
13251320
D222780F2A26217A00D4C708 /* Runestone in Frameworks */,
13261321
D2334EEE25C1C28F00385378 /* awk.xcframework in Frameworks */,
13271322
BDCB7165268E1577007D7047 /* BlinkConfig.framework in Frameworks */,
13281323
D2334EF825C1C28F00385378 /* mosh.xcframework in Frameworks */,
1329-
D218076325CD4FDC00B98902 /* LibSSH.xcframework in Frameworks */,
13301324
D2334F0025C1C28F00385378 /* shell.xcframework in Frameworks */,
13311325
D2A0C2162600D16300F0DF97 /* Protobuf_C_.xcframework in Frameworks */,
13321326
D2334F0C25C1C3C600385378 /* OpenSSH.xcframework in Frameworks */,
13331327
D2C7710726EA49AA001B5659 /* openssl.xcframework in Frameworks */,
1334-
D2F64CAF25CAAA3300F2225D /* libssh2.xcframework in Frameworks */,
13351328
D222780C2A26216900D4C708 /* TreeSitterBashRunestone in Frameworks */,
13361329
D2334EF425C1C28F00385378 /* ios_system.xcframework in Frameworks */,
13371330
07FABBC425C9AECF00E1CC2C /* BlinkFiles.framework in Frameworks */,
@@ -1341,8 +1334,8 @@
13411334
BDE84C512BB233FB00457391 /* bc_ios.xcframework in Frameworks */,
13421335
D297F00F29012FDB002A24F9 /* CachedAsyncImage in Frameworks */,
13431336
D22278082A26216900D4C708 /* TreeSitterBash in Frameworks */,
1344-
D2F64CB125CAAAD100F2225D /* ssh_cmd.xcframework in Frameworks */,
13451337
07FAB90F25C8E94E00E1CC2C /* ArgumentParser in Frameworks */,
1338+
BDF2B8DD2BC48D2800B9C7EA /* LibSSH.xcframework in Frameworks */,
13461339
D2334EFA25C1C28F00385378 /* network_ios.xcframework in Frameworks */,
13471340
D2A6398928CFA0B90066FD18 /* SwiftCBOR in Frameworks */,
13481341
D24AFD58222410E700CFD3C1 /* MBProgressHUD.framework in Frameworks */,
@@ -1467,7 +1460,6 @@
14671460
D2334EC925C1C04700385378 /* shell.xcframework */,
14681461
D2F64C9525CA99AD00F2225D /* libssh2.xcframework */,
14691462
D2F64C9425CA99AD00F2225D /* openssl.xcframework */,
1470-
D2334EC825C1C04700385378 /* ssh_cmd.xcframework */,
14711463
D2334ECD25C1C04700385378 /* tar.xcframework */,
14721464
D2334EC725C1C04700385378 /* text.xcframework */,
14731465
D28DB3AB210B110B008A1139 /* libcompression.tbd */,
@@ -4887,7 +4879,7 @@
48874879
CODE_SIGN_IDENTITY = "iPhone Developer";
48884880
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
48894881
CODE_SIGN_STYLE = Automatic;
4890-
CURRENT_PROJECT_VERSION = 869;
4882+
CURRENT_PROJECT_VERSION = 928;
48914883
DEAD_CODE_STRIPPING = NO;
48924884
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
48934885
DEFINES_MODULE = YES;
@@ -4909,7 +4901,7 @@
49094901
"$(inherited)",
49104902
"$(PROJECT_DIR)/Frameworks",
49114903
);
4912-
MARKETING_VERSION = 17.3.0;
4904+
MARKETING_VERSION = 17.99.9;
49134905
NEW_SETTING = "";
49144906
OTHER_CFLAGS = "$(BLINK_OTHER_CFLAGS)";
49154907
OTHER_LDFLAGS = (
@@ -4939,7 +4931,7 @@
49394931
CODE_SIGN_IDENTITY = "iPhone Developer";
49404932
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
49414933
CODE_SIGN_STYLE = Automatic;
4942-
CURRENT_PROJECT_VERSION = 869;
4934+
CURRENT_PROJECT_VERSION = 928;
49434935
DEAD_CODE_STRIPPING = NO;
49444936
DEFINES_MODULE = YES;
49454937
DEVELOPMENT_TEAM = A2H2CL32AG;
@@ -4956,7 +4948,7 @@
49564948
"$(inherited)",
49574949
"$(PROJECT_DIR)/Frameworks",
49584950
);
4959-
MARKETING_VERSION = 17.3.0;
4951+
MARKETING_VERSION = 17.99.9;
49604952
NEW_SETTING = "";
49614953
OTHER_CFLAGS = "$(BLINK_OTHER_CFLAGS)";
49624954
OTHER_LDFLAGS = (

‎Resources/commandDictionary.plist

+2-30
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
</array>
6161
<key>curl</key>
6262
<array>
63-
<string>MAIN</string>
64-
<string>curl_static_main</string>
63+
<string>curl_ios.framework/curl_ios</string>
64+
<string>curl_main</string>
6565
<string>2346aAbBcCdDeEfgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwxXYyz#</string>
6666
<string>file</string>
6767
</array>
@@ -303,13 +303,6 @@
303303
<string>p</string>
304304
<string>directory</string>
305305
</array>
306-
<key>scp</key>
307-
<array>
308-
<string>MAIN</string>
309-
<string>curl_static_main</string>
310-
<string>q</string>
311-
<string>file</string>
312-
</array>
313306
<key>sed</key>
314307
<array>
315308
<string>text.framework/text</string>
@@ -324,27 +317,6 @@
324317
<string></string>
325318
<string>no</string>
326319
</array>
327-
<key>sftp</key>
328-
<array>
329-
<string>MAIN</string>
330-
<string>curl_static_main</string>
331-
<string>q</string>
332-
<string>file</string>
333-
</array>
334-
<key>ssh</key>
335-
<array>
336-
<string>ssh_cmd.framework/ssh_cmd</string>
337-
<string>ssh_main</string>
338-
<string>q</string>
339-
<string></string>
340-
</array>
341-
<key>ssh-keygen</key>
342-
<array>
343-
<string>ssh_cmd.framework/ssh_cmd</string>
344-
<string>sshkeygen_main</string>
345-
<string>ABHLQXceghiklopquvxyC:D:E:F:G:I:J:K:M:N:O:P:R:S:T:V:W:Z:a:b:f:g:j:m:n:r:s:t:z:</string>
346-
<string>file</string>
347-
</array>
348320
<key>sort</key>
349321
<array>
350322
<string>text.framework/text</string>

‎xcfs/Package.swift

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var binaryTargets: [PackageDescription.Target] = [
99
),
1010
(
1111
"mosh",
12-
"e66c01f593116fd787cf289387cf7a1613eabf2bd2a95e0e610a5309a2a7f523",
12+
"acf9a5aebfb5b05da243d5ec914e22d1022c4edf777aceb7e0a9eb46756cd3fa",
1313
"https://github.com/blinksh/mosh-apple/releases/download/v1.4.0+blink-17.3.0/mosh.xcframework.zip"
1414
),
1515
(
@@ -72,6 +72,11 @@ var binaryTargets: [PackageDescription.Target] = [
7272
"9fe5f119b2d5568d2255e2540f36e76525bfbeaeda58f32f02592ca8d74f4178",
7373
"https://github.com/holzschu/network_ios/releases/download/v0.3/network_ios.xcframework.zip"
7474
),
75+
(
76+
"curl_ios",
77+
"59b437111a5e47039fc900ce207ca0a4b3a7d411cebb576beae3f0631a05922e",
78+
"https://github.com/holzschu/ios_system/releases/download/v3.0.3/curl_ios.xcframework.zip"
79+
),
7580
(
7681
"bc",
7782
"e3d72c562f726614e273efb06f6e63ccd23f9e38b14c468cf9febd4302df5fdd",

0 commit comments

Comments
 (0)