upgraded to kitura 1.0

boostcode · Sep 25, 2016 · 3d60e84 · 3d60e84
1 parent ae8778e
commit 3d60e84
Show file tree

Hide file tree

Showing 13 changed files with 1,523 additions and 1,598 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-DEVELOPMENT-SNAPSHOT-2016-07-25-a
+3.0
diff --git a/Package.swift b/Package.swift
@@ -3,6 +3,6 @@ import PackageDescription
 let package = Package(
     name: "ToriHasParameter",
     dependencies: [
-        .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 0, minor: 27)
+        .Package(url: "https://github.com/IBM-Swift/Kitura.git", majorVersion: 1, minor: 0)
     ]
 )
diff --git a/Sources/ToriHasParameter.swift b/Sources/ToriHasParameter.swift
@@ -29,7 +29,7 @@ public class HasParameter: RouterMiddleware {
         self.returnStatus = returnStatus
     }
 
-    public func handle(request: RouterRequest, response: RouterResponse, next: () -> Void) {
+    public func handle(request: RouterRequest, response: RouterResponse, next: @escaping () -> Void) {
 
         // loop params
         for param in params {

diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
diff --git a/Tests/ToriHasParameter/ToriHasParameterTests.swift b/Tests/ToriHasParameter/ToriHasParameterTests.swift
diff --git a/ToriHasParameter.xcodeproj/GeneratedModuleMap/CHTTPParser/module.modulemap b/ToriHasParameter.xcodeproj/GeneratedModuleMap/CHTTPParser/module.modulemap
@@ -1,5 +1,5 @@
 framework module CHTTPParser {
-    umbrella "/Users/matteocrippa/Repositories/ToriHasParameter/Packages/CHTTPParser-0.3.0/Sources/CHTTPParser/include"
+    umbrella "/Volumes/HDD/matteocrippa/Repositories/Tori-HasParameter/Packages/CHTTPParser-0.3.0/Sources/CHTTPParser/include"
     link framework "CHTTPParser"
     export *
 }
diff --git a/...proj/ToriHasParameterTestSuite_Info.plist → ...Parameter.xcodeproj/SSLService_Info.plist b/...proj/ToriHasParameterTestSuite_Info.plist → ...Parameter.xcodeproj/SSLService_Info.plist
@@ -12,7 +12,7 @@
   <key>CFBundleName</key>
   <string>$(PRODUCT_NAME)</string>
   <key>CFBundlePackageType</key>
-  <string>BNDL</string>
+  <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
   <string>1.0</string>
   <key>CFBundleSignature</key>

diff --git a/ToriHasParameter.xcodeproj/project.pbxproj b/ToriHasParameter.xcodeproj/project.pbxproj
diff --git a/ToriHasParameter.xcodeproj/project.xcworkspace/xcshareddata/ToriHasParameter.xcscmblueprint b/ToriHasParameter.xcodeproj/project.xcworkspace/xcshareddata/ToriHasParameter.xcscmblueprint
@@ -0,0 +1,58 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "FC2F0DF3A0391198B9921857849AF8CE96016062",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "B48A9580752F9C43885C949B19DDA563AC9BB228" : 9223372036854775807,
+    "43C021D2F0E746BBB29CA4E06229F111196D4871" : 9223372036854775807,
+    "FC2F0DF3A0391198B9921857849AF8CE96016062" : 9223372036854775807,
+    "77528AA6C8B451D66547916CA3CB970C85CBD7B4" : 9223372036854775807,
+    "1A81AC7E588BE86E760603555BCE76FB0C611997" : 9223372036854775807,
+    "85E996FB125657C20E42A299A76F925867A7A6E4" : 9223372036854775807
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D711A1DE-E712-4713-A66F-4AEF075CE7D1",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "B48A9580752F9C43885C949B19DDA563AC9BB228" : "Tori-HasParameter\/Packages\/CHTTPParser-0.3.0\/",
+    "43C021D2F0E746BBB29CA4E06229F111196D4871" : "Tori-HasParameter\/Packages\/Socket-0.11.11\/",
+    "FC2F0DF3A0391198B9921857849AF8CE96016062" : "Tori-HasParameter\/",
+    "77528AA6C8B451D66547916CA3CB970C85CBD7B4" : "Tori-HasParameter\/Packages\/SSLService-0.11.21\/",
+    "1A81AC7E588BE86E760603555BCE76FB0C611997" : "Tori-HasParameter\/Packages\/Kitura-TemplateEngine-1.0.0\/",
+    "85E996FB125657C20E42A299A76F925867A7A6E4" : "Tori-HasParameter\/Packages\/LoggerAPI-1.0.0\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "ToriHasParameter",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "ToriHasParameter.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/IBM-Swift\/Kitura-TemplateEngine.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "1A81AC7E588BE86E760603555BCE76FB0C611997"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/IBM-Swift\/BlueSocket.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "43C021D2F0E746BBB29CA4E06229F111196D4871"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/IBM-Swift\/BlueSSLService.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "77528AA6C8B451D66547916CA3CB970C85CBD7B4"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/IBM-Swift\/LoggerAPI.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "85E996FB125657C20E42A299A76F925867A7A6E4"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/IBM-Swift\/CHTTPParser.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "B48A9580752F9C43885C949B19DDA563AC9BB228"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/boostcode\/Tori-HasParameter.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "FC2F0DF3A0391198B9921857849AF8CE96016062"
+    }
+  ]
+}
diff --git a/...oj/project.xcworkspace/xcuserdata/matteocrippa.xcuserdatad/UserInterfaceState.xcuserstate b/...oj/project.xcworkspace/xcuserdata/matteocrippa.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ToriHasParameter.xcodeproj/xcshareddata/xcschemes/ToriHasParameter.xcscheme b/ToriHasParameter.xcodeproj/xcshareddata/xcschemes/ToriHasParameter.xcscheme
@@ -28,9 +28,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "______Target_KituraSys"
-               BuildableName = "KituraSys.framework"
-               BlueprintName = "KituraSys"
+               BlueprintIdentifier = "______Target_Socket"
+               BuildableName = "Socket.framework"
+               BlueprintName = "Socket"
                ReferencedContainer = "container:ToriHasParameter.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -42,9 +42,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "______Target_Socket"
-               BuildableName = "Socket.framework"
-               BlueprintName = "Socket"
+               BlueprintIdentifier = "______Target_CHTTPParser"
+               BuildableName = "CHTTPParser.framework"
+               BlueprintName = "CHTTPParser"
                ReferencedContainer = "container:ToriHasParameter.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -56,9 +56,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "______Target_CHTTPParser"
-               BuildableName = "CHTTPParser.framework"
-               BlueprintName = "CHTTPParser"
+               BlueprintIdentifier = "______Target_SSLService"
+               BuildableName = "SSLService.framework"
+               BlueprintName = "SSLService"
                ReferencedContainer = "container:ToriHasParameter.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -138,19 +138,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "______Target_ToriHasParameterTestSuite"
-               BuildableName = "ToriHasParameterTestSuite.xctest"
-               BlueprintName = "ToriHasParameterTestSuite"
-               ReferencedContainer = "container:ToriHasParameter.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <AdditionalOptions>
       </AdditionalOptions>

diff --git a/...arameter.xcodeproj/xcuserdata/matteocrippa.xcuserdatad/xcschemes/xcschememanagement.plist b/...arameter.xcodeproj/xcuserdata/matteocrippa.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -34,6 +34,11 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>______Target_SSLService</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>______Target_Socket</key>
 		<dict>
 			<key>primary</key>