Merge pull request #410 from yaroslavyaroslav/develop

Fix building issue

Author: yaroslavyaroslav

.gitignore

@@ -35,8 +35,8 @@ playground.xcworkspace
 # Swift Package Manager
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
+Packages/
+Package.pins
 .build/
 
 # CocoaPods

Package.swift

@@ -1,15 +1,23 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.4
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
+
+#if os(macOS)
+let excludeFiles = [
+    "./Browser/BrowserViewController.swift", // Because of inheriting iOS only class failed to build on macOS.
+]
+#elseif os(iOS)
+let excludeFiles: String = []
+#endif
+
 let package = Package(
     name: "Web3swift",
     platforms: [
         .macOS(.v10_12), .iOS(.v11),
     ],
     products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(name: "web3swift", targets: ["web3swift"]),
     ],
 
@@ -20,14 +28,18 @@ let package = Package(
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.4.2"),
     ],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(name: "secp256k1"),
+
         .target(
             name: "web3swift",
             dependencies: ["BigInt", "secp256k1", "PromiseKit", "Starscream", "CryptoSwift"],
-            exclude: [
-            ]),
+            exclude: excludeFiles,
+            resources: [
+                .copy("./Browser/browser.js"),
+                .copy("./Browser/browser.min.js"),
+                .copy("./Browser/wk.bridge.min.js")
+            ]
+        ),
         .testTarget(
             name: "web3swiftTests",
             dependencies: ["web3swift"]),

[email protected]

@@ -0,0 +1,35 @@
+// swift-tools-version:5.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Web3swift",
+    platforms: [
+        .macOS(.v10_12), .iOS(.v11),
+    ],
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(name: "web3swift", targets: ["web3swift"]),
+    ],
+    
+    dependencies: [
+        .package(url: "https://github.com/attaswift/BigInt.git", from: "5.3.0"),
+        .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.15.4"),
+        .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.4"),
+        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.4.2"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(name: "secp256k1"),
+        .target(
+            name: "web3swift",
+            dependencies: ["BigInt", "secp256k1", "PromiseKit", "Starscream", "CryptoSwift"],
+            exclude: [
+            ]),
+        .testTarget(
+            name: "web3swiftTests",
+            dependencies: ["web3swift"]),
+    ]
+)

Sources/web3swift/Browser/BrowserViewController.swift

@@ -8,6 +8,7 @@
 
 import WebKit
 
+// FIXME: Rewrite me, because i'm building only on iOS.
 open class BrowserViewController: UIViewController {
 
     public enum Method: String {