Added macOS, watchOS, tvOS Carthage Support

Fixed CocoaPods support Fixed non-ssse cpu support
oday0311 · Dec 6, 2018 · c12fd7e · c12fd7e
1 parent 06706d9
commit c12fd7e
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 4 deletions.
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,3 @@
+github "attaswift/BigInt" "v3.1.0"
+github "attaswift/SipHash" "v1.2.2"
+github "mxcl/PromiseKit" "6.7.0"
diff --git a/Sources/scrypt/crypto_scrypt_smix_sse2.c b/Sources/scrypt/crypto_scrypt_smix_sse2.c
@@ -26,6 +26,8 @@
  * This file was originally written by Colin Percival as part of the Tarsnap
  * online backup system.
  */
+
+#if defined(__SSSE3__)
 #include <emmintrin.h>
 #include <stdint.h>
 
@@ -242,3 +244,4 @@ crypto_scrypt_smix_sse2(uint8_t * B, size_t r, uint64_t N, void * V, void * XY)
 	}
 }
 
+#endif
diff --git a/Sources/web3swift/Migration.swift b/Sources/web3swift/Migration.swift
@@ -17,7 +17,7 @@ import BigInt
 /// 3. repeat
 
 
-/// web3swift 2.1 changes
+// MARK:- web3swift 2.1 changes
 
 extension EthereumBloomFilter {
     @available(*, deprecated: 2.1, renamed: "test(topic:)")
@@ -58,7 +58,7 @@ extension Web3Contract {
 	public typealias TransactionIntermediate = web3swift.TransactionIntermediate
 }
 
-/// web3swift 2.0 changes
+// MARK:- web3swift 2.0 changes
 
 @available (*, deprecated: 2.0, renamed: "JsonRpcRequest")
 public typealias JSONRPCrequest = JsonRpcRequest

diff --git a/web3swift.podspec b/web3swift.podspec
@@ -10,8 +10,8 @@ Pod::Spec.new do |spec|
     spec.homepage     = 'https://github.com/bankex/web3swift'
     spec.author       = 'Bankex Foundation'
     spec.source       = { :git => 'https://github.com/bankex/web3swift.git', :branch => 'develop' }
-    spec.source_files = 'Sources/web3swift'
-
+    spec.source_files = 'Sources/web3swift/**/*.swift'
+    spec.swift_version = '4.2'
     spec.dependency 'PromiseKit', '~> 6.4'
     spec.dependency 'BigInt', '~> 3.1'
     spec.dependency 'secp256k1.c', '~> 0.1'

diff --git a/web3swift.xcodeproj/project.pbxproj b/web3swift.xcodeproj/project.pbxproj
@@ -364,6 +364,7 @@
 		13A8D50C21B7447400469740 /* asprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = asprintf.c; sourceTree = "<group>"; };
 		13A8D52521B7451800469740 /* keccak.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = keccak.swift; sourceTree = "<group>"; };
 		13A8D54B21B7493900469740 /* scrypt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = scrypt.swift; sourceTree = "<group>"; };
+		13A8D5BD21B9296B00469740 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
 		13A93F5921B0A36900F115E4 /* AES.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AES.swift; sourceTree = "<group>"; };
 		13A93F5F21B172D900F115E4 /* Transaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Transaction.swift; sourceTree = "<group>"; };
 		13AC5D3D21A5D109009D0309 /* SolidityDataReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolidityDataReader.swift; sourceTree = "<group>"; };
@@ -889,6 +890,7 @@
 		13C3392721B6C68900F33F5E /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				13A8D5BD21B9296B00469740 /* CoreImage.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1552,6 +1554,28 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
+				OTHER_LDFLAGS = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=appletvos*]" = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=iphoneos*]" = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=macosx*]" = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=watchos*]" = "";
+				"OTHER_LDFLAGS[sdk=watchsimulator*]" = "";
 				PRODUCT_BUNDLE_IDENTIFIER = org.bankexfoundation.web3swift;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -1584,6 +1608,28 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
+				OTHER_LDFLAGS = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=appletvos*]" = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=iphoneos*]" = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=macosx*]" = (
+					"-framework",
+					CoreImage,
+				);
+				"OTHER_LDFLAGS[sdk=watchos*]" = "";
+				"OTHER_LDFLAGS[sdk=watchsimulator*]" = "";
 				PRODUCT_BUNDLE_IDENTIFIER = org.bankexfoundation.web3swift;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;