Skip to content

Commit 0c8079a

Browse files
HuYueeHuYuee
authored
Merge pull request #44 from HuYuee/master
Feature/v1.10.2
2 parents 1c24aae + 21e8e06 commit 0c8079a

File tree

64 files changed

+258
-525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+258
-525
lines changed

‎HTTPDNSDemo/MSDKDnsDemo.xcodeproj/project.pbxproj

+29-41
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 54;
6+
objectVersion = 46;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -50,7 +50,9 @@
5050
509467661EAC915800F53427 /* launch.png in Resources */ = {isa = PBXBuildFile; fileRef = 509467651EAC915800F53427 /* launch.png */; };
5151
5F1332EB28FFECED00A22D2A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4426DD581C294083007D0A9E /* libsqlite3.tbd */; };
5252
5F1A214C28C0AE810008E8FC /* SNIViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F1A214B28C0AE800008E8FC /* SNIViewController.m */; };
53-
5F5B282C2AE7C32E0067651F /* MSDKDns_C11.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F5B282B2AE7C32E0067651F /* MSDKDns_C11.xcframework */; };
53+
5F2B79B12B95A8E800C4A4D3 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F2B79AF2B95A8E800C4A4D3 /* WebViewController.m */; };
54+
5F2B79B32B95A9EA00C4A4D3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F2B79B22B95A9EA00C4A4D3 /* WebKit.framework */; };
55+
5F619FA22BA8231B0015E5E0 /* MSDKDns_C11.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F619FA12BA8231B0015E5E0 /* MSDKDns_C11.framework */; };
5456
5F85CB9328B3A2A5003D20D1 /* HttpDnsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F85CB9228B3A2A4003D20D1 /* HttpDnsViewController.m */; };
5557
5F85CB9728B3A368003D20D1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4426DD521C29406A007D0A9E /* libz.tbd */; };
5658
5F85CB9928B3A37B003D20D1 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F85CB9828B3A37B003D20D1 /* CoreFoundation.framework */; };
@@ -136,8 +138,12 @@
136138
509467651EAC915800F53427 /* launch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launch.png; sourceTree = "<group>"; };
137139
50A0FEDE1D0E8C6A004C502B /* BeaconAPI_Base.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BeaconAPI_Base.framework; sourceTree = "<group>"; };
138140
5F1A214B28C0AE800008E8FC /* SNIViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SNIViewController.m; sourceTree = "<group>"; };
139-
5F5B282B2AE7C32E0067651F /* MSDKDns_C11.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MSDKDns_C11.xcframework; path = "../../../../../Library/Developer/Xcode/DerivedData/sdkWorkspace-fzwspzfjxkyulaczlxnxaymfxjfm/Build/Products/Debug-iphoneos/MSDKDns_C11.xcframework"; sourceTree = "<group>"; };
141+
5F2B79AF2B95A8E800C4A4D3 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; };
142+
5F2B79B02B95A8E800C4A4D3 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
143+
5F2B79B22B95A9EA00C4A4D3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
144+
5F2B79B42B95A9F900C4A4D3 /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = System/Library/Frameworks/Network.framework; sourceTree = SDKROOT; };
140145
5F5DAF5428A602AD00BF5B79 /* testConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = testConfig.h; sourceTree = "<group>"; };
146+
5F619FA12BA8231B0015E5E0 /* MSDKDns_C11.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MSDKDns_C11.framework; path = "../../../../../Library/Developer/Xcode/DerivedData/sdkWorkspace-fzwspzfjxkyulaczlxnxaymfxjfm/Build/Products/Debug-iphoneos/MSDKDns_C11.framework"; sourceTree = "<group>"; };
141147
5F85CB9228B3A2A4003D20D1 /* HttpDnsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpDnsViewController.m; sourceTree = "<group>"; };
142148
5F85CB9828B3A37B003D20D1 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
143149
/* End PBXFileReference section */
@@ -151,7 +157,7 @@
151157
5F85CB9A28B3A38B003D20D1 /* Security.framework in Frameworks */,
152158
4426DD6D1C2942B6007D0A9E /* libc++.tbd in Frameworks */,
153159
4426DD5B1C29408A007D0A9E /* libxml2.tbd in Frameworks */,
154-
5F5B282C2AE7C32E0067651F /* MSDKDns_C11.xcframework in Frameworks */,
160+
5F2B79B32B95A9EA00C4A4D3 /* WebKit.framework in Frameworks */,
155161
4426DD571C29407B007D0A9E /* libz.1.1.3.tbd in Frameworks */,
156162
4426DD531C29406A007D0A9E /* libz.tbd in Frameworks */,
157163
44F12A8C1B48E8A800812340 /* Security.framework in Frameworks */,
@@ -167,6 +173,7 @@
167173
5F85CB9B28B3A393003D20D1 /* Security.framework in Frameworks */,
168174
44F12A771B48E7BF00812340 /* CoreGraphics.framework in Frameworks */,
169175
44F12A751B48E7B600812340 /* Foundation.framework in Frameworks */,
176+
5F619FA22BA8231B0015E5E0 /* MSDKDns_C11.framework in Frameworks */,
170177
5F85CB9928B3A37B003D20D1 /* CoreFoundation.framework in Frameworks */,
171178
44F12A731B48E7B000812340 /* UIKit.framework in Frameworks */,
172179
44F12A711B48E7AB00812340 /* SystemConfiguration.framework in Frameworks */,
@@ -187,8 +194,10 @@
187194
2F3B2A7125F21C28004A70B9 /* Frameworks */ = {
188195
isa = PBXGroup;
189196
children = (
197+
5F2B79B42B95A9F900C4A4D3 /* Network.framework */,
198+
5F2B79B22B95A9EA00C4A4D3 /* WebKit.framework */,
199+
5F619FA12BA8231B0015E5E0 /* MSDKDns_C11.framework */,
190200
5F85CB9828B3A37B003D20D1 /* CoreFoundation.framework */,
191-
5F5B282B2AE7C32E0067651F /* MSDKDns_C11.xcframework */,
192201
);
193202
name = Frameworks;
194203
sourceTree = "<group>";
@@ -231,6 +240,8 @@
231240
5F85CB9228B3A2A4003D20D1 /* HttpDnsViewController.m */,
232241
504F54421ECB02D4001BD7A9 /* SNIViewController.h */,
233242
5F1A214B28C0AE800008E8FC /* SNIViewController.m */,
243+
5F2B79B02B95A8E800C4A4D3 /* WebViewController.h */,
244+
5F2B79AF2B95A8E800C4A4D3 /* WebViewController.m */,
234245
44F12A411B48E52A00812340 /* Main.storyboard */,
235246
44F12A441B48E52A00812340 /* Images.xcassets */,
236247
44F12A461B48E52A00812340 /* LaunchScreen.xib */,
@@ -414,6 +425,7 @@
414425
buildActionMask = 2147483647;
415426
files = (
416427
5F85CB9328B3A2A5003D20D1 /* HttpDnsViewController.m in Sources */,
428+
5F2B79B12B95A8E800C4A4D3 /* WebViewController.m in Sources */,
417429
44F12A3D1B48E52A00812340 /* AppDelegate.m in Sources */,
418430
44F12A3A1B48E52A00812340 /* main.m in Sources */,
419431
5F1A214C28C0AE810008E8FC /* SNIViewController.m in Sources */,
@@ -499,7 +511,7 @@
499511
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
500512
GCC_WARN_UNUSED_FUNCTION = YES;
501513
GCC_WARN_UNUSED_VARIABLE = YES;
502-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
514+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
503515
MTL_ENABLE_DEBUG_INFO = YES;
504516
ONLY_ACTIVE_ARCH = YES;
505517
SDKROOT = iphoneos;
@@ -537,7 +549,7 @@
537549
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
538550
GCC_WARN_UNUSED_FUNCTION = YES;
539551
GCC_WARN_UNUSED_VARIABLE = YES;
540-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
552+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
541553
MTL_ENABLE_DEBUG_INFO = NO;
542554
SDKROOT = iphoneos;
543555
TARGETED_DEVICE_FAMILY = "1,2";
@@ -566,12 +578,8 @@
566578
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
567579
HEADER_SEARCH_PATHS = "";
568580
INFOPLIST_FILE = MSDKDnsDemo/Info.plist;
569-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
570-
LD_RUNPATH_SEARCH_PATHS = (
571-
"$(inherited)",
572-
"@executable_path/Frameworks",
573-
"$(PROJECT_DIR)/../..",
574-
);
581+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
582+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PROJECT_DIR)/../..";
575583
ONLY_ACTIVE_ARCH = YES;
576584
OTHER_LDFLAGS = (
577585
"-ObjC",
@@ -606,12 +614,8 @@
606614
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
607615
HEADER_SEARCH_PATHS = "";
608616
INFOPLIST_FILE = MSDKDnsDemo/Info.plist;
609-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
610-
LD_RUNPATH_SEARCH_PATHS = (
611-
"$(inherited)",
612-
"@executable_path/Frameworks",
613-
"$(PROJECT_DIR)/../..",
614-
);
617+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
618+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PROJECT_DIR)/../..";
615619
ONLY_ACTIVE_ARCH = YES;
616620
OTHER_LDFLAGS = (
617621
"-ObjC",
@@ -640,11 +644,7 @@
640644
"$(inherited)",
641645
);
642646
INFOPLIST_FILE = MSDKDnsDemoTests/Info.plist;
643-
LD_RUNPATH_SEARCH_PATHS = (
644-
"$(inherited)",
645-
"@executable_path/Frameworks",
646-
"@loader_path/Frameworks",
647-
);
647+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
648648
PRODUCT_NAME = "$(TARGET_NAME)";
649649
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MSDKDnsDemo.app/MSDKDnsDemo";
650650
};
@@ -661,11 +661,7 @@
661661
);
662662
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
663663
INFOPLIST_FILE = MSDKDnsDemoTests/Info.plist;
664-
LD_RUNPATH_SEARCH_PATHS = (
665-
"$(inherited)",
666-
"@executable_path/Frameworks",
667-
"@loader_path/Frameworks",
668-
);
664+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
669665
PRODUCT_NAME = "$(TARGET_NAME)";
670666
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MSDKDnsDemo.app/MSDKDnsDemo";
671667
};
@@ -701,7 +697,7 @@
701697
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
702698
GCC_WARN_UNUSED_FUNCTION = YES;
703699
GCC_WARN_UNUSED_VARIABLE = YES;
704-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
700+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
705701
MTL_ENABLE_DEBUG_INFO = NO;
706702
SDKROOT = iphoneos;
707703
TARGETED_DEVICE_FAMILY = "1,2";
@@ -730,12 +726,8 @@
730726
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
731727
HEADER_SEARCH_PATHS = "";
732728
INFOPLIST_FILE = MSDKDnsDemo/Info.plist;
733-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
734-
LD_RUNPATH_SEARCH_PATHS = (
735-
"$(inherited)",
736-
"@executable_path/Frameworks",
737-
"$(PROJECT_DIR)/../..",
738-
);
729+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
730+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PROJECT_DIR)/../..";
739731
ONLY_ACTIVE_ARCH = YES;
740732
OTHER_LDFLAGS = (
741733
"-ObjC",
@@ -761,11 +753,7 @@
761753
);
762754
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
763755
INFOPLIST_FILE = MSDKDnsDemoTests/Info.plist;
764-
LD_RUNPATH_SEARCH_PATHS = (
765-
"$(inherited)",
766-
"@executable_path/Frameworks",
767-
"@loader_path/Frameworks",
768-
);
756+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
769757
PRODUCT_NAME = "$(TARGET_NAME)";
770758
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MSDKDnsDemo.app/MSDKDnsDemo";
771759
};

‎HTTPDNSDemo/MSDKDnsDemo.xcodeproj/xcshareddata/xcschemes/MSDKDnsDemo.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1310"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)