Use explicit module map

yenom · Feb 10, 2018 · d65d7e6 · d65d7e6
1 parent 3e410b7
commit d65d7e6
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/BitcoinKit.podspec b/BitcoinKit.podspec
@@ -14,6 +14,8 @@ Pod::Spec.new do |spec|
   spec.requires_arc = true
   spec.source = { git: 'https://github.com/kishikawakatsumi/BitcoinKit.git', tag: "v#{spec.version}" }
   spec.source_files = 'BitcoinKit/**/*.{h,m,swift}'
+  spec.private_header_files = 'BitcoinKit/**/BitcoinKitInternal.h'
+  spec.module_map = 'BitcoinKit/BitcoinKit.modulemap'
   spec.ios.deployment_target = '8.0'
   spec.swift_version = '4.0'
 

diff --git a/BitcoinKit.xcodeproj/project.pbxproj b/BitcoinKit.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1419E83A202CDBE500FCB0BE /* BitcoinKitInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419E838202CDBE500FCB0BE /* BitcoinKitInternal.h */; };
+		1419E83A202CDBE500FCB0BE /* BitcoinKitInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419E838202CDBE500FCB0BE /* BitcoinKitInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		1419E83B202CDBE500FCB0BE /* BitcoinKitInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = 1419E839202CDBE500FCB0BE /* BitcoinKitInternal.m */; };
 		141FE2E22022588C00A08B04 /* PublicKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 141FE2E12022588C00A08B04 /* PublicKey.swift */; };
 		141FE2E42022589E00A08B04 /* PrivateKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 141FE2E32022589E00A08B04 /* PrivateKey.swift */; };
@@ -479,6 +479,7 @@
 					"$(SRCROOT)/Libraries/openssl/lib",
 					"$(SRCROOT)/Libraries/secp256k1/lib",
 				);
+				MODULEMAP_FILE = "$(SRCROOT)/BitcoinKit/BitcoinKit.modulemap";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kishikawakatsumi.BitcoinKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -512,6 +513,7 @@
 					"$(SRCROOT)/Libraries/openssl/lib",
 					"$(SRCROOT)/Libraries/secp256k1/lib",
 				);
+				MODULEMAP_FILE = "$(SRCROOT)/BitcoinKit/BitcoinKit.modulemap";
 				PRODUCT_BUNDLE_IDENTIFIER = com.kishikawakatsumi.BitcoinKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/BitcoinKit/BitcoinKit.modulemap b/BitcoinKit/BitcoinKit.modulemap
@@ -0,0 +1,11 @@
+framework module BitcoinKit {
+    umbrella header "BitcoinKit.h"
+
+    export *
+    module * { export * }
+
+    explicit module Private {
+        header "BitcoinKitInternal.h"
+        link "crypto"
+    }
+}
diff --git a/BitcoinKit/Crypto.swift b/BitcoinKit/Crypto.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import BitcoinKitInternal
+import BitcoinKit.Private
 import secp256k1
 
 public struct Crypto {

diff --git a/BitcoinKit/HDPrivateKey.swift b/BitcoinKit/HDPrivateKey.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import BitcoinKitInternal
+import BitcoinKit.Private
 
 public class HDPrivateKey {
     public let network: Network

diff --git a/BitcoinKit/HDPublicKey.swift b/BitcoinKit/HDPublicKey.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import BitcoinKitInternal
+import BitcoinKit.Private
 
 public class HDPublicKey {
     public let network: Network

diff --git a/BitcoinKit/Mnemonic.swift b/BitcoinKit/Mnemonic.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import BitcoinKitInternal
+import BitcoinKit.Private
 
 public struct Mnemonic {
     public enum Strength : Int {

diff --git a/BitcoinKit/PublicKey.swift b/BitcoinKit/PublicKey.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import BitcoinKitInternal
+import BitcoinKit.Private
 
 public struct PublicKey {
     let raw: Data

diff --git a/Libraries/BitcoinKitInternal/module.modulemap b/Libraries/BitcoinKitInternal/module.modulemap