Merge pull request #74 from YangSen-qn/master

support SPM
qiniu · Jan 17, 2022 · 45f2d81 · 45f2d81
2 parents 754985f + ca49ddf
commit 45f2d81
Show file tree

Hide file tree

Showing 39 changed files with 127 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ DerivedData
 #
 Pods/
 Podfile.lock
+.swiftpm
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 #Changelog
+## 1.0.1 (2021-11-25)
+* 支持 Swift Package Manager
+* Dnspod 默认 server ip 切至 119.29.29.98
+
 ## 1.0.0 (2021-09-02)
 
 * 新增 dns udp 解析 api

diff --git a/HappyDNS.podspec b/HappyDNS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'HappyDNS'
-  s.version      = '1.0.0'
+  s.version      = '1.0.1'
   s.summary      = 'DNS library for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/happy-dns-objc'
   s.social_media_url = 'http://weibo.com/qiniutek'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '6.0'
   s.osx.deployment_target = '10.8'
   s.libraries = 'resolv'
-  s.source_files = 'HappyDNS/**/*.{h,m}'
+  s.source_files = 'HappyDNS/Common/*.{h,m}','HappyDNS/Dns/*.{h,m}','HappyDNS/Http/*.{h,m}','HappyDNS/Local/*.{h,m}','HappyDNS/Util/*.{h,m}','HappyDNS/HappyDNS.h'
   s.requires_arc = true
   s.license = { :type => 'MIT', :text => <<-LICENSE
 The MIT License (MIT)

diff --git a/HappyDNS.xcodeproj/project.pbxproj b/HappyDNS.xcodeproj/project.pbxproj
diff --git a/HappyDNS/QNDnsError.h → HappyDNS/Common/QNDnsError.h b/HappyDNS/QNDnsError.h → HappyDNS/Common/QNDnsError.h
diff --git a/HappyDNS/QNDnsError.m → HappyDNS/Common/QNDnsError.m b/HappyDNS/QNDnsError.m → HappyDNS/Common/QNDnsError.m
diff --git a/HappyDNS/HappyDNS.h b/HappyDNS/HappyDNS.h
@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "QNDnsError.h"
 #import "QNDnsManager.h"
 #import "QNDnspodEnterprise.h"
 #import "QNDomain.h"

diff --git a/HappyDNS/Http/QNDnspodEnterprise.m b/HappyDNS/Http/QNDnspodEnterprise.m
@@ -30,13 +30,13 @@ @implementation QNDnspodEnterprise
 
 - (instancetype)initWithId:(NSString *)userId
                        key:(NSString *)key {
-    return [self initWithId:userId key:key server:@"119.29.29.29"];
+    return [self initWithId:userId key:key server:@"119.29.29.98"];
 }
 
 - (instancetype)initWithId:(NSString *)userId
                        key:(NSString *)key
                     server:(NSString *)server {
-    return [self initWithId:userId key:key server:@"119.29.29.29" timeout:QN_DNS_DEFAULT_TIMEOUT];
+    return [self initWithId:userId key:key server:@"119.29.29.98" timeout:QN_DNS_DEFAULT_TIMEOUT];
 }
 
 - (instancetype)initWithId:(NSString *)userId

diff --git a/HappyDNS/Local/QNHosts.m b/HappyDNS/Local/QNHosts.m
@@ -65,7 +65,7 @@ @implementation QNHosts
             [x addObject:first];
         }
     }
-    
+
     NSArray <QNHostsValue *> *values = filter([x copy], netInfo.provider);
     return [self toRecords:values];
 }
@@ -74,7 +74,7 @@ @implementation QNHosts
     if (values == nil) {
         return nil;
     }
-    
+
     NSMutableArray<QNRecord *> *records = [NSMutableArray array];
     for (QNHostsValue *value in values) {
         if (value.record != nil && value.record.value != nil) {
@@ -84,6 +84,7 @@ @implementation QNHosts
     return [records copy];
 }
 
+
 - (void)put:(NSString *)domain record:(QNRecord *)record {
     [self put:domain record:record provider:kQNISP_GENERAL];
 }

diff --git a/HappyDNS/include/HappyDNS/HappyDNS.h b/HappyDNS/include/HappyDNS/HappyDNS.h
@@ -0,0 +1 @@
+../../HappyDNS.h
diff --git a/HappyDNS/include/HappyDNS/NSData+QNRW.h b/HappyDNS/include/HappyDNS/NSData+QNRW.h
@@ -0,0 +1 @@
+../../Util/NSData+QNRW.h
diff --git a/HappyDNS/include/HappyDNS/QNAsyncUdpSocket.h b/HappyDNS/include/HappyDNS/QNAsyncUdpSocket.h
@@ -0,0 +1 @@
+../../Util/QNAsyncUdpSocket.h
diff --git a/HappyDNS/include/HappyDNS/QNDes.h b/HappyDNS/include/HappyDNS/QNDes.h
@@ -0,0 +1 @@
+../../Util/QNDes.h
diff --git a/HappyDNS/include/HappyDNS/QNDnsDefine.h b/HappyDNS/include/HappyDNS/QNDnsDefine.h
@@ -0,0 +1 @@
+../../Dns/QNDnsDefine.h
diff --git a/HappyDNS/include/HappyDNS/QNDnsError.h b/HappyDNS/include/HappyDNS/QNDnsError.h
@@ -0,0 +1 @@
+../../Common/QNDnsError.h
diff --git a/HappyDNS/include/HappyDNS/QNDnsManager.h b/HappyDNS/include/HappyDNS/QNDnsManager.h
@@ -0,0 +1 @@
+../../Common/QNDnsManager.h
diff --git a/HappyDNS/include/HappyDNS/QNDnsMessage.h b/HappyDNS/include/HappyDNS/QNDnsMessage.h
@@ -0,0 +1 @@
+../../Dns/QNDnsMessage.h
diff --git a/HappyDNS/include/HappyDNS/QNDnsRequest.h b/HappyDNS/include/HappyDNS/QNDnsRequest.h
@@ -0,0 +1 @@
+../../Dns/QNDnsRequest.h
diff --git a/HappyDNS/include/HappyDNS/QNDnsResolver.h b/HappyDNS/include/HappyDNS/QNDnsResolver.h
@@ -0,0 +1 @@
+../../Dns/QNDnsResolver.h
diff --git a/HappyDNS/include/HappyDNS/QNDnsResponse.h b/HappyDNS/include/HappyDNS/QNDnsResponse.h
@@ -0,0 +1 @@
+../../Dns/QNDnsResponse.h
diff --git a/HappyDNS/include/HappyDNS/QNDnsUdpResolver.h b/HappyDNS/include/HappyDNS/QNDnsUdpResolver.h
@@ -0,0 +1 @@
+../../Dns/QNDnsUdpResolver.h
diff --git a/HappyDNS/include/HappyDNS/QNDnspodEnterprise.h b/HappyDNS/include/HappyDNS/QNDnspodEnterprise.h
@@ -0,0 +1 @@
+../../Http/QNDnspodEnterprise.h
diff --git a/HappyDNS/include/HappyDNS/QNDohResolver.h b/HappyDNS/include/HappyDNS/QNDohResolver.h
@@ -0,0 +1 @@
+../../Dns/QNDohResolver.h
diff --git a/HappyDNS/include/HappyDNS/QNDomain.h b/HappyDNS/include/HappyDNS/QNDomain.h
@@ -0,0 +1 @@
+../../Common/QNDomain.h
diff --git a/HappyDNS/include/HappyDNS/QNGetAddrInfo.h b/HappyDNS/include/HappyDNS/QNGetAddrInfo.h
@@ -0,0 +1 @@
+../../Util/QNGetAddrInfo.h
diff --git a/HappyDNS/include/HappyDNS/QNHex.h b/HappyDNS/include/HappyDNS/QNHex.h
@@ -0,0 +1 @@
+../../Util/QNHex.h
diff --git a/HappyDNS/include/HappyDNS/QNHijackingDetectWrapper.h b/HappyDNS/include/HappyDNS/QNHijackingDetectWrapper.h
@@ -0,0 +1 @@
+../../Local/QNHijackingDetectWrapper.h
diff --git a/HappyDNS/include/HappyDNS/QNHosts.h b/HappyDNS/include/HappyDNS/QNHosts.h
@@ -0,0 +1 @@
+../../Local/QNHosts.h
diff --git a/HappyDNS/include/HappyDNS/QNIP.h b/HappyDNS/include/HappyDNS/QNIP.h
@@ -0,0 +1 @@
+../../Util/QNIP.h
diff --git a/HappyDNS/include/HappyDNS/QNLruCache.h b/HappyDNS/include/HappyDNS/QNLruCache.h
@@ -0,0 +1 @@
+../../Common/QNLruCache.h
diff --git a/HappyDNS/include/HappyDNS/QNMD5.h b/HappyDNS/include/HappyDNS/QNMD5.h
@@ -0,0 +1 @@
+../../Util/QNMD5.h
diff --git a/HappyDNS/include/HappyDNS/QNNetworkInfo.h b/HappyDNS/include/HappyDNS/QNNetworkInfo.h
@@ -0,0 +1 @@
+../../Common/QNNetworkInfo.h
diff --git a/HappyDNS/include/HappyDNS/QNRecord.h b/HappyDNS/include/HappyDNS/QNRecord.h
@@ -0,0 +1 @@
+../../Common/QNRecord.h
diff --git a/HappyDNS/include/HappyDNS/QNResolvUtil.h b/HappyDNS/include/HappyDNS/QNResolvUtil.h
@@ -0,0 +1 @@
+../../Local/QNResolvUtil.h
diff --git a/HappyDNS/include/HappyDNS/QNResolver.h b/HappyDNS/include/HappyDNS/QNResolver.h
@@ -0,0 +1 @@
+../../Local/QNResolver.h
diff --git a/HappyDNS/include/HappyDNS/QNResolverDelegate.h b/HappyDNS/include/HappyDNS/QNResolverDelegate.h
@@ -0,0 +1 @@
+../../Common/QNResolverDelegate.h
diff --git a/HappyDNS/include/HappyDNS/QNTxtResolver.h b/HappyDNS/include/HappyDNS/QNTxtResolver.h
@@ -0,0 +1 @@
+../../Local/QNTxtResolver.h
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,35 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "HappyDNS",
+    platforms: [
+        .macOS(.v10_10),
+        .iOS(.v8)
+    ],
+    products: [
+        .library(
+            name: "HappyDNS",
+            targets: ["HappyDNS"]),
+    ],
+    dependencies: [
+    ],
+    targets: [
+        .target(
+            name: "HappyDNS",
+            path: "HappyDNS",
+            sources: ["Common", "Dns", "Http", "Local", "Util"],
+            cSettings: [
+                .headerSearchPath("Common"),
+                .headerSearchPath("Dns"),
+                .headerSearchPath("Http"),
+                .headerSearchPath("Local"),
+                .headerSearchPath("Util"),
+            ],
+            linkerSettings:[
+                .linkedLibrary("resolv", nil)
+            ]),
+    ]
+)
diff --git a/README.md b/README.md
@@ -14,11 +14,26 @@
 ## 安装
 
 通过CocoaPods
-
 ```ruby
 pod "HappyDNS"
 ```
 
+通过 Swift Package Manager (Xcode 11+)
+```
+App 对接:
+File -> Swift Packages -> Add Package Dependency，输入 HappyDNS 库链接，选择相应版本即可
+库链接: https://github.com/qiniu/happy-dns-objc
+
+库对接:
+let package = Package(
+    dependencies: [
+        .package(url: "https://github.com/qiniu/happy-dns-objc", from: "1.0.1")
+    ],
+    // ...
+)
+
+```
+
 ## 运行环境
 
 
@@ -30,7 +45,7 @@ pod "HappyDNS"
 [array addObject:[[QNResolver alloc] initWithAddress:@"119.29.29.29"]];
 [array addObject:[QNDohResolver resolverWithServer:@"https://dns.alidns.com/dns-query"]];
 QNDnsManager *dns = [[QNDnsManager alloc] init:array networkInfo:[QNNetworkInfo normal]];
-NSArray <QNRecord *> *records = [dns queryRecords:@"www.qiniu.com"];;
+NSArray <QNRecord *> *records = [dns queryRecords:@"www.qiniu.com"];
 ```
 ＊ url 请求，返回一个IP 替换URL 里的domain
 ```
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,3 +35,4 @@ DerivedData @@
     #
     Pods/
     Podfile.lock
+    .swiftpm