Merge pull request #52 from raptorxcz/feature/swift_package_manager

Fix SPM

.Package.test.swift

@@ -1,10 +1,33 @@
+// swift-tools-version:4.2
+
 import PackageDescription
 
 let package = Package(
     name: "SwinjectAutoregistration",
+    products: [
+        .library(
+            name: "SwinjectAutoregistration",
+            targets: ["SwinjectAutoregistration"])
+    ],
     dependencies: [
-        .Package(url: "https://github.com/Swinject/Swinject.git", majorVersion: 2, minor: 5),
-        .Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
-        .Package(url: "https://github.com/Quick/Nimble", majorVersion: 7),
+        .package(url: "https://github.com/Swinject/Swinject.git", from: "2.6.0"),
+        .package(url: "https://github.com/Quick/Quick", from: "2.1.0"),
+        .package(url: "https://github.com/Quick/Nimble", from: "8.0.1")
+    ],
+    targets: [
+        .target(
+            name: "SwinjectAutoregistration",
+            dependencies: [
+                "Swinject",
+            ],
+            path: "Sources"),
+        .testTarget(
+            name: "SwinjectAutoregistrationTests",
+            dependencies: [
+                "Quick",
+                "Nimble",
+                "Swinject",
+                "SwinjectAutoregistration",
+            ])
     ]
 )

.gitignore

@@ -67,3 +67,5 @@ fastlane/screenshots
 
 ## SwinjectStoryboard
 SwinjectStoryboard.framework.zip
+
+Package.resolved

.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v8.0.1"
-github "Quick/Quick" "v2.0.0"
-github "Swinject/Swinject" "2.6.0"
+github "Quick/Nimble" "v8.0.2"
+github "Quick/Quick" "v2.1.0"
+github "Swinject/Swinject" "2.6.2"

Package.swift

@@ -1,8 +1,23 @@
+// swift-tools-version:4.2
+
 import PackageDescription
 
 let package = Package(
     name: "SwinjectAutoregistration",
+    products: [
+        .library(
+            name: "SwinjectAutoregistration",
+            targets: ["SwinjectAutoregistration"])
+    ],
     dependencies: [
-        .Package(url: "https://github.com/Swinject/Swinject.git", majorVersion: 2)
+        .package(url: "https://github.com/Swinject/Swinject.git", from: "2.6.0"),
+    ],
+    targets: [
+        .target(
+            name: "SwinjectAutoregistration",
+            dependencies: [
+                "Swinject",
+            ],
+            path: "Sources"),
     ]
-)
+)

Tests/SwinjectAutoregistrationTests/AutoregistrationSpec.swift

@@ -207,8 +207,8 @@ class AutoregistrationSpec: QuickSpec {
                 let service = container.resolve(UnwrappedService.self)
                 expect(service).notTo(beNil())
             }
-            
-            #if !os(Linux)
+
+            #if !SWIFT_PACKAGE
             it("throws assertion when same type arguments are passed") {
                 expect { () -> Void in
                     container.autoregister(SameArgumentsService.self, arguments: String.self, Int.self, String.self, initializer: SameArgumentsService.init)
@@ -237,8 +237,8 @@ class AutoregistrationSpec: QuickSpec {
                 expect(unresolvableService).to(beNil())
                 expect(logs.count) == 1
             }
-            
-            #if !os(Linux)
+
+            #if !SWIFT_PACKAGE
             it("does not loose any logs while multithreading"){
                 var logs: [String] = []
                 Container.loggingFunction = { logs.append($0) }
@@ -266,6 +266,7 @@ class AutoregistrationSpec: QuickSpec {
             }
             #endif
 
+
         }
     }
 }

Tests/SwinjectAutoregistrationTests/OperatorsSpec.swift

@@ -56,8 +56,8 @@ class OperatorsSpec: QuickSpec {
                 let service = container ~> (Service0.self, name: "MyService")
                 expect(service).toNot(beNil())
             }
-            
-            #if !os(Linux)
+
+            #if !SWIFT_PACKAGE
             it("fails with message on unresolvable service") {
                     var logs = [String]()
                     Container.loggingFunction = { logs.append($0) }

Tests/SwinjectAutoregistrationTests/ResolutionErrorSpec.swift

@@ -1,4 +1,4 @@
-#if !os(Linux)
+#if !SWIFT_PACKAGE
 import Quick
 import Nimble