Merge pull request #2 from sublabdev/dev

Added SPM support

Author: Alex Oakley

.gitignore

@@ -1,3 +1,9 @@
+/Packages
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
+
+
 .DS_Store
 # Xcode
 #

Example/HashingSwift.xcodeproj/project.pbxproj

@@ -329,7 +329,8 @@
 				"${BUILT_PRODUCTS_DIR}/Blake2/Blake2.framework",
 				"${BUILT_PRODUCTS_DIR}/CommonSwift/CommonSwift.framework",
 				"${BUILT_PRODUCTS_DIR}/HashingSwift/HashingSwift.framework",
-				"${BUILT_PRODUCTS_DIR}/keccak.c/keccak.framework",
+				"${BUILT_PRODUCTS_DIR}/KeccakC/KeccakC.framework",
+				"${BUILT_PRODUCTS_DIR}/KeccakSwift/KeccakSwift.framework",
 				"${BUILT_PRODUCTS_DIR}/xxHash-Swift/xxHash_Swift.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -339,7 +340,8 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Blake2.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CommonSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HashingSwift.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/keccak.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeccakC.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeccakSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/xxHash_Swift.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Example/Podfile.lock

@@ -6,12 +6,14 @@ PODS:
   - CommonSwift (1.0.0):
     - BigInt (~> 5.0.0)
   - HashingSwift (1.0.0):
-    - Base58Swift (~> 2.1.10)
-    - Blake2 (~> 0.1.2)
-    - CommonSwift
-    - keccak.c (~> 0.1.3)
-    - xxHash-Swift (~> 1.1.1)
-  - keccak.c (0.1.3)
+    - Base58Swift (= 2.1.10)
+    - Blake2 (= 0.1.2)
+    - CommonSwift (= 1.0.0)
+    - KeccakSwift (= 1.0.0)
+    - xxHash-Swift (= 1.1.1)
+  - KeccakC (1.0.0)
+  - KeccakSwift (1.0.0):
+    - KeccakC (= 1.0.0)
   - xxHash-Swift (1.1.1)
 
 DEPENDENCIES:
@@ -23,7 +25,8 @@ SPEC REPOS:
     - Base58Swift
     - BigInt
     - Blake2
-    - keccak.c
+    - KeccakC
+    - KeccakSwift
     - xxHash-Swift
 
 EXTERNAL SOURCES:
@@ -43,10 +46,11 @@ SPEC CHECKSUMS:
   BigInt: 74b4d88367b0e819d9f77393549226d36faeb0d8
   Blake2: f33072b13349da1b8048a2bf26a3a24d4eac6dcc
   CommonSwift: ad350f0e06c040e5cb660cd7154f947851c73fbd
-  HashingSwift: d97c9d264e558e471b15d4c65773104c587a9b4c
-  keccak.c: 859583afdaccb4e4fcc0f0096064d101580313f4
+  HashingSwift: 146b65631c26f10e2b699efdff38cf338affe559
+  KeccakC: f5c18471a67e3bcabbd3427696bb653ef1e28b88
+  KeccakSwift: cafb62fc6886d980a85e8ab5106367b794d76074
   xxHash-Swift: 13ebcbfc48658a5acf3777751e64b18c0f110d25
 
 PODFILE CHECKSUM: 94e0abb08bcbfe869a91c6f141ccbf5fea8b0d0d
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

HashingSwift.podspec

@@ -7,11 +7,11 @@ Pod::Spec.new do |s|
   s.author           = { 'Substrate Laboratory LLC' => 'info@sublab.dev' }
   s.source           = { :git => 'https://github.com/sublabdev/hashing-swift.git', :tag => s.version.to_s }
   s.ios.deployment_target = '13.0'
-  s.source_files = 'HashingSwift/Classes/**/*'
-  s.dependency 'CommonSwift', '~> 1.0.0'
-  s.dependency 'xxHash-Swift', '~> 1.1.1'
-  s.dependency 'Base58Swift', '~> 2.1.10'
-  s.dependency 'Blake2', '~> 0.1.2'
-  s.dependency 'keccak.c', '~> 0.1.3'
-  
+  s.osx.deployment_target = '10.15'
+  s.source_files = 'Sources/HashingSwift/**/*'
+  s.dependency 'CommonSwift', '1.0.0'
+  s.dependency 'KeccakSwift', '1.0.0'
+  s.dependency 'xxHash-Swift', '1.1.1'
+  s.dependency 'Base58Swift', '2.1.10'
+  s.dependency 'Blake2', '0.1.2'
 end

HashingSwift/Assets/.gitkeep

@@ -0,0 +1,41 @@
+// swift-tools-version:5.6
+
+import PackageDescription
+
+let package = Package(
+    name: "HashingSwift",
+    platforms: [
+        .iOS(.v13),
+        .macOS(.v10_15),
+        .watchOS(.v6),
+        .tvOS(.v13)
+    ],
+    products: [
+        .library(
+            name: "HashingSwift",
+            targets: ["HashingSwift"]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/sublabdev/common-swift.git", exact: "1.0.0"),
+        .package(url: "https://github.com/sublabdev/keccak-swift.git", exact: "1.0.0"),
+        .package(url: "https://github.com/daisuke-t-jp/xxHash-Swift", exact: "1.1.1"),
+        .package(url: "https://github.com/keefertaylor/Base58Swift.git", exact: "2.1.10"),
+        .package(url: "https://github.com/tesseract-one/Blake2.swift.git", exact: "0.1.2")
+    ],
+    targets: [
+        .target(
+            name: "HashingSwift",
+            dependencies: [
+                .productItem(name: "CommonSwift", package: "common-swift"),
+                .productItem(name: "KeccakSwift", package: "keccak-swift"),
+                .productItem(name: "xxHash-Swift", package: "xxHash-Swift"),
+                .productItem(name: "Base58Swift", package: "Base58Swift"),
+                .productItem(name: "Blake2", package: "Blake2.swift"),
+            ]
+        )
+    ],
+    swiftLanguageVersions: [
+        .v5
+    ]
+)

HashingSwift/Classes/.gitkeep

@@ -7,7 +7,7 @@
 
 </div>
 
-[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/hashing-swift)](https://img.shields.io/cocoapods/v/hashing-swift)
+[![CocoaPods Compatible](https://img.shields.io/cocoapods/v/HashingSwift)](https://img.shields.io/cocoapods/v/HashingSwift)
 [![Swift](https://img.shields.io/badge/Swift-5.0.0-orange?style=flat-square)](https://img.shields.io/badge/Swift-5.0.0-Orange?style=flat-square)
 [![Telegram channel](https://img.shields.io/badge/chat-telegram-green.svg?logo=telegram)](https://t.me/sublabsupport)
 [![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
@@ -30,12 +30,25 @@ Our goal is to have more developers to come into the world of development of cli
 
 ## Installation
 
+### CocoaPods
+
 [CocoaPods](https://cocoapods.org) is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate Alamofire into your Xcode project using CocoaPods, specify it in your `Podfile`:
 
 ```ruby
 pod 'HashingSwift'
 ```
 
+### Swift Package Manager
+
+The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the `swift` compiler.
+
+Once you have your Swift package set up, adding HashingSwift as a dependency is as easy as adding it to the `dependencies` value of your `Package.swift`.
+
+```swift
+.package(url: "https://github.com/sublabdev/hashing-swift.git", from: "1.0.0")
+```
+
+
 ## Documentation
 
 - Our GitBook: [https://docs.sublab.dev/swift-libraries/hashing-library](https://docs.sublab.dev/swift-libraries/hashing-library)