Skip to content

Commit 253053d

Browse files
rafiki270rafiki270
authored
Merge pull request #46 from skelpo/vapor-4
Updated Implementation and API for Vapor 4
2 parents 48367b8 + 5afae04 commit 253053d

35 files changed

+562
-481
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1
1+
5.1

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎.swiftpm/xcode/package.xcworkspace/xcuserdata/calebkleveter.xcuserdatad/UserInterfaceState.xcuserstate

65.2 KB
Binary file not shown.

‎.swiftpm/xcode/xcuserdata/calebkleveter.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>S3-Package.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
<key>S3.xcscheme_^#shared#^_</key>
13+
<dict>
14+
<key>orderHint</key>
15+
<integer>1</integer>
16+
</dict>
17+
<key>S3DemoRun.xcscheme_^#shared#^_</key>
18+
<dict>
19+
<key>orderHint</key>
20+
<integer>4</integer>
21+
</dict>
22+
<key>S3Signer.xcscheme_^#shared#^_</key>
23+
<dict>
24+
<key>orderHint</key>
25+
<integer>2</integer>
26+
</dict>
27+
<key>S3TestTools.xcscheme_^#shared#^_</key>
28+
<dict>
29+
<key>orderHint</key>
30+
<integer>3</integer>
31+
</dict>
32+
</dict>
33+
<key>SuppressBuildableAutocreation</key>
34+
<dict>
35+
<key>S3</key>
36+
<dict>
37+
<key>primary</key>
38+
<true/>
39+
</dict>
40+
<key>S3DemoApp</key>
41+
<dict>
42+
<key>primary</key>
43+
<true/>
44+
</dict>
45+
<key>S3DemoRun</key>
46+
<dict>
47+
<key>primary</key>
48+
<true/>
49+
</dict>
50+
<key>S3Signer</key>
51+
<dict>
52+
<key>primary</key>
53+
<true/>
54+
</dict>
55+
<key>S3TestTools</key>
56+
<dict>
57+
<key>primary</key>
58+
<true/>
59+
</dict>
60+
<key>S3Tests</key>
61+
<dict>
62+
<key>primary</key>
63+
<true/>
64+
</dict>
65+
</dict>
66+
</dict>
67+
</plist>

‎Package.resolved

Lines changed: 44 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ let package = Package(
99
.library(name: "S3TestTools", targets: ["S3TestTools"])
1010
],
1111
dependencies: [
12-
.package(url: "https://github.com/vapor/vapor.git", from: "3.0.0"),
13-
.package(url: "https://github.com/LiveUI/XMLCoding.git", from: "0.1.0"),
14-
.package(url: "https://github.com/LiveUI/VaporTestTools.git", from: "0.1.5")
12+
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-alpha"),
13+
.package(url: "https://github.com/LiveUI/XMLCoding.git", from: "0.1.0")
1514
],
1615
targets: [
1716
.target(name: "S3", dependencies: [
@@ -36,7 +35,6 @@ let package = Package(
3635
),
3736
.target(name: "S3TestTools", dependencies: [
3837
"Vapor",
39-
"VaporTestTools",
4038
"S3"
4139
]
4240
),

0 commit comments

Comments
 (0)