Skip to content

Commit 3a5239e

Browse files
Matthew BenedictMatthew Benedict
Matthew Benedict
authored and
Matthew Benedict
committed
Late stage corrections
1 parent ab3698d commit 3a5239e

9 files changed

Lines changed: 77 additions & 14 deletions

File tree

‎Source/CyberKit/Configurations/CyberKit.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit;
130130
FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework CyberKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_ASSERTION_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
131131

132132
// Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols.
133-
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol -Wl,__ZNKSt3__18functionIFvN7CyberCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEED1Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEED2Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol -Wl,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE;
133+
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol -Wl,__ZNKSt3__18functionIFvN7CyberCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEED1Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEED2Ev -Wl,-unexported_symbol -Wl,__ZNSt3__18functionIFvN7CyberCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol -Wl,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_13basic_istreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE0_NS_14basic_iostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE16_NS_13basic_ostreamIcS2_EE -Wl,-unexported_symbol -Wl,__ZTTNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__115basic_stringbufIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTVNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE -Wl,-unexported_symbol -Wl,__ZTCNSt3__118basic_stringstreamIcNS_11char_traitsIcEENS_9allocatorIcEEEE8_NS_13basic_ostreamIcS2_EE, -Wl,-U,_UIPreviewDataAttachmentListSourceIsManaged -Wl,-U,_OBJC_CLASS_$_UIWKSelectionAssistant;
134134

135135
LIBWEBRTC_LIBRARY_DIR = $(LIBWEBRTC_LIBRARY_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
136136
LIBWEBRTC_LIBRARY_DIR_COCOA_TOUCH_YES = $(WEBCORE_FRAMEWORKS_DIR)/CyberCore.framework/Frameworks

‎Source/CyberKit/CyberKit.xcodeproj/project.pbxproj‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12387,6 +12387,7 @@
1238712387
isa = XCBuildConfiguration;
1238812388
baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
1238912389
buildSettings = {
12390+
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
1239012391
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
1239112392
PRODUCT_NAME = PluginProcessShim;
1239212393
};
@@ -12396,6 +12397,7 @@
1239612397
isa = XCBuildConfiguration;
1239712398
baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
1239812399
buildSettings = {
12400+
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
1239912401
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
1240012402
PRODUCT_NAME = PluginProcessShim;
1240112403
};
@@ -12405,6 +12407,7 @@
1240512407
isa = XCBuildConfiguration;
1240612408
baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
1240712409
buildSettings = {
12410+
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
1240812411
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
1240912412
PRODUCT_NAME = PluginProcessShim;
1241012413
};
@@ -12417,6 +12420,7 @@
1241712420
CODE_SIGN_IDENTITY = "Apple Development";
1241812421
CODE_SIGN_STYLE = Automatic;
1241912422
DEVELOPMENT_TEAM = SJ87WGCZM7;
12423+
ENABLE_BITCODE = NO;
1242012424
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
1242112425
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKit;
1242212426
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12430,6 +12434,7 @@
1243012434
CODE_SIGN_IDENTITY = "Apple Development";
1243112435
CODE_SIGN_STYLE = Automatic;
1243212436
DEVELOPMENT_TEAM = SJ87WGCZM7;
12437+
ENABLE_BITCODE = NO;
1243312438
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
1243412439
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKit;
1243512440
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12485,7 +12490,9 @@
1248512490
CODE_SIGN_IDENTITY = "Apple Development";
1248612491
CODE_SIGN_STYLE = Automatic;
1248712492
DEVELOPMENT_TEAM = SJ87WGCZM7;
12493+
ENABLE_BITCODE = NO;
1248812494
PROVISIONING_PROFILE_SPECIFIER = "";
12495+
SDKROOT = iphoneos;
1248912496
};
1249012497
name = Debug;
1249112498
};
@@ -12496,7 +12503,9 @@
1249612503
CODE_SIGN_IDENTITY = "Apple Development";
1249712504
CODE_SIGN_STYLE = Automatic;
1249812505
DEVELOPMENT_TEAM = SJ87WGCZM7;
12506+
ENABLE_BITCODE = NO;
1249912507
PROVISIONING_PROFILE_SPECIFIER = "";
12508+
SDKROOT = iphoneos;
1250012509
};
1250112510
name = Release;
1250212511
};
@@ -12507,47 +12516,59 @@
1250712516
CODE_SIGN_IDENTITY = "Apple Development";
1250812517
CODE_SIGN_STYLE = Automatic;
1250912518
DEVELOPMENT_TEAM = SJ87WGCZM7;
12519+
ENABLE_BITCODE = NO;
1251012520
PROVISIONING_PROFILE_SPECIFIER = "";
12521+
SDKROOT = iphoneos;
1251112522
};
1251212523
name = Production;
1251312524
};
1251412525
372EBB432017E64300085064 /* Debug */ = {
1251512526
isa = XCBuildConfiguration;
1251612527
baseConfigurationReference = 372EBB4A2017E76000085064 /* WebContentService.Development.xcconfig */;
1251712528
buildSettings = {
12529+
CODE_SIGN_ENTITLEMENTS = "";
1251812530
CODE_SIGN_IDENTITY = "Apple Development";
1251912531
CODE_SIGN_STYLE = Automatic;
1252012532
DEVELOPMENT_TEAM = SJ87WGCZM7;
12533+
ENABLE_BITCODE = NO;
1252112534
PROVISIONING_PROFILE_SPECIFIER = "";
12535+
SDKROOT = iphoneos;
1252212536
};
1252312537
name = Debug;
1252412538
};
1252512539
372EBB442017E64300085064 /* Release */ = {
1252612540
isa = XCBuildConfiguration;
1252712541
baseConfigurationReference = 372EBB4A2017E76000085064 /* WebContentService.Development.xcconfig */;
1252812542
buildSettings = {
12543+
CODE_SIGN_ENTITLEMENTS = "";
1252912544
CODE_SIGN_IDENTITY = "Apple Development";
1253012545
CODE_SIGN_STYLE = Automatic;
1253112546
DEVELOPMENT_TEAM = SJ87WGCZM7;
12547+
ENABLE_BITCODE = NO;
1253212548
PROVISIONING_PROFILE_SPECIFIER = "";
12549+
SDKROOT = iphoneos;
1253312550
};
1253412551
name = Release;
1253512552
};
1253612553
372EBB452017E64300085064 /* Production */ = {
1253712554
isa = XCBuildConfiguration;
1253812555
baseConfigurationReference = 372EBB4A2017E76000085064 /* WebContentService.Development.xcconfig */;
1253912556
buildSettings = {
12557+
CODE_SIGN_ENTITLEMENTS = "";
1254012558
CODE_SIGN_IDENTITY = "Apple Development";
1254112559
CODE_SIGN_STYLE = Automatic;
1254212560
DEVELOPMENT_TEAM = SJ87WGCZM7;
12561+
ENABLE_BITCODE = NO;
1254312562
PROVISIONING_PROFILE_SPECIFIER = "";
12563+
SDKROOT = iphoneos;
1254412564
};
1254512565
name = Production;
1254612566
};
1254712567
510031F31379CACB00C8DFE4 /* Debug */ = {
1254812568
isa = XCBuildConfiguration;
1254912569
baseConfigurationReference = A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */;
1255012570
buildSettings = {
12571+
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
1255112572
PRODUCT_NAME = SecItemShim;
1255212573
};
1255312574
name = Debug;
@@ -12556,6 +12577,7 @@
1255612577
isa = XCBuildConfiguration;
1255712578
baseConfigurationReference = A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */;
1255812579
buildSettings = {
12580+
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
1255912581
PRODUCT_NAME = SecItemShim;
1256012582
};
1256112583
name = Release;
@@ -12564,6 +12586,7 @@
1256412586
isa = XCBuildConfiguration;
1256512587
baseConfigurationReference = A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */;
1256612588
buildSettings = {
12589+
CODE_SIGN_IDENTITY = "Apple Development: uint2048@icloud.com (9ACBG9YARX)";
1256712590
PRODUCT_NAME = SecItemShim;
1256812591
};
1256912592
name = Production;
@@ -12618,6 +12641,7 @@
1261812641
CODE_SIGN_IDENTITY = "Apple Development";
1261912642
CODE_SIGN_STYLE = Automatic;
1262012643
DEVELOPMENT_TEAM = SJ87WGCZM7;
12644+
ENABLE_BITCODE = NO;
1262112645
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
1262212646
PRODUCT_BUNDLE_IDENTIFIER = com.matthewbenedict.CyberKit;
1262312647
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12652,98 +12676,125 @@
1265212676
isa = XCBuildConfiguration;
1265312677
baseConfigurationReference = BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */;
1265412678
buildSettings = {
12679+
CODE_SIGN_ENTITLEMENTS = "";
1265512680
CODE_SIGN_IDENTITY = "Apple Development";
1265612681
CODE_SIGN_STYLE = Automatic;
1265712682
DEVELOPMENT_TEAM = SJ87WGCZM7;
12683+
ENABLE_BITCODE = NO;
1265812684
PROVISIONING_PROFILE_SPECIFIER = "";
12685+
SDKROOT = iphoneos;
1265912686
};
1266012687
name = Debug;
1266112688
};
1266212689
BC3DE47415A91764008D26FC /* Release */ = {
1266312690
isa = XCBuildConfiguration;
1266412691
baseConfigurationReference = BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */;
1266512692
buildSettings = {
12693+
CODE_SIGN_ENTITLEMENTS = "";
1266612694
CODE_SIGN_IDENTITY = "Apple Development";
1266712695
CODE_SIGN_STYLE = Automatic;
1266812696
DEVELOPMENT_TEAM = SJ87WGCZM7;
12697+
ENABLE_BITCODE = NO;
1266912698
PROVISIONING_PROFILE_SPECIFIER = "";
12699+
SDKROOT = iphoneos;
1267012700
};
1267112701
name = Release;
1267212702
};
1267312703
BC3DE47515A91764008D26FC /* Production */ = {
1267412704
isa = XCBuildConfiguration;
1267512705
baseConfigurationReference = BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */;
1267612706
buildSettings = {
12707+
CODE_SIGN_ENTITLEMENTS = "";
1267712708
CODE_SIGN_IDENTITY = "Apple Development";
1267812709
CODE_SIGN_STYLE = Automatic;
1267912710
DEVELOPMENT_TEAM = SJ87WGCZM7;
12711+
ENABLE_BITCODE = NO;
1268012712
PROVISIONING_PROFILE_SPECIFIER = "";
12713+
SDKROOT = iphoneos;
1268112714
};
1268212715
name = Production;
1268312716
};
1268412717
BC8283BE16B4BF7700A278FE /* Debug */ = {
1268512718
isa = XCBuildConfiguration;
1268612719
baseConfigurationReference = BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */;
1268712720
buildSettings = {
12721+
CODE_SIGN_ENTITLEMENTS = "";
1268812722
CODE_SIGN_IDENTITY = "Apple Development";
1268912723
CODE_SIGN_STYLE = Automatic;
1269012724
DEVELOPMENT_TEAM = SJ87WGCZM7;
12725+
ENABLE_BITCODE = NO;
1269112726
PROVISIONING_PROFILE_SPECIFIER = "";
12727+
SDKROOT = iphoneos;
1269212728
};
1269312729
name = Debug;
1269412730
};
1269512731
BC8283BF16B4BF7700A278FE /* Release */ = {
1269612732
isa = XCBuildConfiguration;
1269712733
baseConfigurationReference = BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */;
1269812734
buildSettings = {
12735+
CODE_SIGN_ENTITLEMENTS = "";
1269912736
CODE_SIGN_IDENTITY = "Apple Development";
1270012737
CODE_SIGN_STYLE = Automatic;
1270112738
DEVELOPMENT_TEAM = SJ87WGCZM7;
12739+
ENABLE_BITCODE = NO;
1270212740
PROVISIONING_PROFILE_SPECIFIER = "";
12741+
SDKROOT = iphoneos;
1270312742
};
1270412743
name = Release;
1270512744
};
1270612745
BC8283C016B4BF7700A278FE /* Production */ = {
1270712746
isa = XCBuildConfiguration;
1270812747
baseConfigurationReference = BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */;
1270912748
buildSettings = {
12749+
CODE_SIGN_ENTITLEMENTS = "";
1271012750
CODE_SIGN_IDENTITY = "Apple Development";
1271112751
CODE_SIGN_STYLE = Automatic;
1271212752
DEVELOPMENT_TEAM = SJ87WGCZM7;
12753+
ENABLE_BITCODE = NO;
1271312754
PROVISIONING_PROFILE_SPECIFIER = "";
12755+
SDKROOT = iphoneos;
1271412756
};
1271512757
name = Production;
1271612758
};
1271712759
BC82842B16B4FDF700A278FE /* Debug */ = {
1271812760
isa = XCBuildConfiguration;
1271912761
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
1272012762
buildSettings = {
12763+
CODE_SIGN_ENTITLEMENTS = "";
1272112764
CODE_SIGN_IDENTITY = "Apple Development";
1272212765
CODE_SIGN_STYLE = Automatic;
1272312766
DEVELOPMENT_TEAM = SJ87WGCZM7;
12767+
ENABLE_BITCODE = NO;
1272412768
PROVISIONING_PROFILE_SPECIFIER = "";
12769+
SDKROOT = iphoneos;
1272512770
};
1272612771
name = Debug;
1272712772
};
1272812773
BC82842C16B4FDF700A278FE /* Release */ = {
1272912774
isa = XCBuildConfiguration;
1273012775
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
1273112776
buildSettings = {
12777+
CODE_SIGN_ENTITLEMENTS = "";
1273212778
CODE_SIGN_IDENTITY = "Apple Development";
1273312779
CODE_SIGN_STYLE = Automatic;
1273412780
DEVELOPMENT_TEAM = SJ87WGCZM7;
12781+
ENABLE_BITCODE = NO;
1273512782
PROVISIONING_PROFILE_SPECIFIER = "";
12783+
SDKROOT = iphoneos;
1273612784
};
1273712785
name = Release;
1273812786
};
1273912787
BC82842D16B4FDF700A278FE /* Production */ = {
1274012788
isa = XCBuildConfiguration;
1274112789
baseConfigurationReference = BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */;
1274212790
buildSettings = {
12791+
CODE_SIGN_ENTITLEMENTS = "";
1274312792
CODE_SIGN_IDENTITY = "Apple Development";
1274412793
CODE_SIGN_STYLE = Automatic;
1274512794
DEVELOPMENT_TEAM = SJ87WGCZM7;
12795+
ENABLE_BITCODE = NO;
1274612796
PROVISIONING_PROFILE_SPECIFIER = "";
12797+
SDKROOT = iphoneos;
1274712798
};
1274812799
name = Production;
1274912800
};

‎Source/CyberKit/NetworkProcess/NetworkConnectionToWebProcess.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,10 @@ class NetworkConnectionToWebProcess
263263
uint64_t nextMessageBatchIdentifier(Function<void()>&&);
264264

265265
struct ResourceNetworkActivityTracker {
266+
#pragma clang diagnostic push
267+
#pragma clang diagnostic ignored "-Wdefaulted-function-deleted"
266268
ResourceNetworkActivityTracker() = default;
269+
#pragma clang diagnostic pop
267270
ResourceNetworkActivityTracker(const ResourceNetworkActivityTracker&) = default;
268271
ResourceNetworkActivityTracker(ResourceNetworkActivityTracker&&) = default;
269272
ResourceNetworkActivityTracker(CyberCore::PageIdentifier pageID)

‎Source/CyberKit/Platform/spi/ios/UIKitSPI.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,14 @@ typedef NS_ENUM(NSInteger, UIScrollViewIndicatorInsetAdjustmentBehavior) {
352352
UIScrollViewIndicatorInsetAdjustmentNever
353353
};
354354

355+
#if __IPHONE_OS_VERSION_MAX_ALLOWED < 130000
355356
typedef enum {
356357
UIAxisNeither = 0,
357358
UIAxisHorizontal = 1 << 0,
358359
UIAxisVertical = 1 << 1,
359360
UIAxisBoth = (UIAxisHorizontal | UIAxisVertical),
360361
} UIAxis;
362+
#endif
361363

362364
@interface UIScrollView ()
363365
- (void)_stopScrollingAndZoomingAnimations;
@@ -383,9 +385,11 @@ typedef enum {
383385
- (CGSize)_legacy_sizeWithFont:(UIFont *)font minFontSize:(CGFloat)minFontSize actualFontSize:(CGFloat *)actualFontSize forWidth:(CGFloat)width lineBreakMode:(NSLineBreakMode)lineBreakMode;
384386
@end
385387

388+
#if __IPHONE_OS_VERSION_MAX_ALLOWED < 130000
386389
@interface UIGestureRecognizer ()
387390
@property (nonatomic, readonly, getter=_modifierFlags) UIKeyModifierFlags modifierFlags;
388391
@end
392+
#endif
389393

390394
@interface UITapGestureRecognizer ()
391395
@property (nonatomic, getter=_allowableSeparation, setter=_setAllowableSeparation:) CGFloat allowableSeparation;
@@ -1300,8 +1304,8 @@ void _UIApplicationLoadCyberKit(void);
13001304

13011305
void UIImageDataWriteToSavedPhotosAlbum(NSData *imageData, id completionTarget, SEL completionSelector, void *contextInfo);
13021306

1303-
UIImage* _UIImageGetCyberKitPhotoLibraryIcon(void);
1304-
UIImage* _UIImageGetCyberKitTakePhotoOrVideoIcon(void);
1307+
UIImage* _UIImageGetWebKitPhotoLibraryIcon(void);
1308+
UIImage* _UIImageGetWebKitTakePhotoOrVideoIcon(void);
13051309

13061310
extern const float UIWebViewGrowsAndShrinksToFitHeight;
13071311
extern const float UIWebViewScalesToFitScale;
@@ -1317,7 +1321,7 @@ extern const NSString *UIPreviewDataDDContext;
13171321
extern const NSString *UIPreviewDataAttachmentList;
13181322
extern const NSString *UIPreviewDataAttachmentIndex;
13191323

1320-
#if __IPHONE_OS_VERSION_MAX_ALLOWED < 130000
1324+
#if __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
13211325
extern NSString * const UIPreviewDataAttachmentListSourceIsManaged;
13221326
#else
13231327
extern NSString * const UIPreviewDataAttachmentListIsContentManaged;

‎Source/CyberKit/UIProcess/ios/WKContentViewInteraction.mm‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#import "NativeWebTouchEvent.h"
4040
#import "RemoteLayerTreeDrawingAreaProxy.h"
4141
#import "RemoteLayerTreeViews.h"
42+
#import "RemoteScrollingCoordinatorProxy.h"
4243
#import "SmartMagnificationController.h"
4344
#import "TextChecker.h"
4445
#import "TextInputSPI.h"
@@ -9112,7 +9113,11 @@ - (NSDictionary *)_dataForPreviewItemController:(UIPreviewItemController *)contr
91129113
else
91139114
dataForPreview[UIPreviewDataAttachmentList] = [uiDelegate _attachmentListForWebView:self.webView];
91149115
dataForPreview[UIPreviewDataAttachmentIndex] = [NSNumber numberWithUnsignedInteger:index];
9116+
#if !PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
91159117
dataForPreview[UIPreviewDataAttachmentListIsContentManaged] = [NSNumber numberWithBool:sourceIsManaged];
9118+
#else
9119+
dataForPreview[UIPreviewDataAttachmentListSourceIsManaged] = [NSNumber numberWithBool:sourceIsManaged];
9120+
#endif
91169121
}
91179122
}
91189123

‎Source/CyberKit/UIProcess/ios/forms/WKFileUploadPanel.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ static bool arrayContainsUTIThatConformsTo(NSArray<NSString *> *typeIdentifiers,
7171

7272
static inline UIImage *photoLibraryIcon()
7373
{
74-
return _UIImageGetCyberKitPhotoLibraryIcon();
74+
return _UIImageGetWebKitPhotoLibraryIcon();
7575
}
7676

7777
static inline UIImage *cameraIcon()
7878
{
79-
return _UIImageGetCyberKitTakePhotoOrVideoIcon();
79+
return _UIImageGetWebKitTakePhotoOrVideoIcon();
8080
}
8181

8282
#pragma mark - _WKFileUploadItem

‎Source/CyberKitLegacy/CyberKitLegacy.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3288,7 +3288,7 @@
32883288
);
32893289
runOnlyForDeploymentPostprocessing = 0;
32903290
shellPath = /bin/sh;
3291-
shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names DOM Web _Web || exit $?\nfi";
3291+
shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names DOM Web _Web Cyber _Cyber || exit $?\nfi\n";
32923292
};
32933293
537CF83A22EFBFB100C6EBB3 /* Check .xcfilelists */ = {
32943294
isa = PBXShellScriptBuildPhase;

‎Source/CyberKitLegacy/ios/CyberKit.iOS.exp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ _WebViewportShrinkToFitKey
3737
_WebViewportWidthKey
3838

3939
# So that we can use the MemoryMeasure class in MobileSafari
40-
__ZN6CyberKit13MemoryMeasure10taskMemoryEv
41-
__ZN6CyberKit13MemoryMeasure13enableLoggingEb
42-
__ZN6CyberKit13MemoryMeasure16isLoggingEnabledEv
43-
__ZN6CyberKit13MemoryMeasure18m_isLoggingEnabledE
44-
__ZN6CyberKit13MemoryMeasureD1Ev
45-
__ZN6CyberKit13MemoryMeasureD2Ev
40+
__ZN8CyberKit13MemoryMeasure10taskMemoryEv
41+
__ZN8CyberKit13MemoryMeasure13enableLoggingEb
42+
__ZN8CyberKit13MemoryMeasure16isLoggingEnabledEv
43+
__ZN8CyberKit13MemoryMeasure18m_isLoggingEnabledE
44+
__ZN8CyberKit13MemoryMeasureD1Ev
45+
__ZN8CyberKit13MemoryMeasureD2Ev
4646

4747
# For estimated progress notifications
4848
_WebViewProgressBackgroundColorKey

0 commit comments

Comments
 (0)