Skip to content

Commit babef6c

Browse files
a2a2
committed
Update Swift to 3.1
1 parent f341917 commit babef6c

File tree

4 files changed

+186
-7
lines changed

4 files changed

+186
-7
lines changed

Diff for: ‎.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.1
1+
3.1

Diff for: ‎Dockerfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# Based on instructions from
2-
# https://gist.github.com/alexaubry/bea6f9b626e71b48ae6065664748bc97
1+
# Based on instructions from https://git.io/v9FmJ
32

4-
FROM aleksaubry/swift-docker:xenial-3.0.1
3+
FROM aleksaubry/swift-apns:3.1.0
54

65
ADD ./ /app
76
WORKDIR /app
@@ -11,11 +10,11 @@ RUN apt-get update
1110
RUN apt-get install -y libpq-dev
1211

1312
# Build Swift
14-
RUN swift build --config release
13+
RUN swift build -c release
1514

1615
ENV PATH /app/.build/release:$PATH
1716

18-
RUN chmod -R a+w /app && chmod -R 777 /app
17+
RUN chmod -R a+rwx /app
1918

2019
RUN useradd -m myuser
2120
USER myuser

Diff for: ‎Package.pins

+180
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
{
2+
"autoPin": true,
3+
"pins": [
4+
{
5+
"package": "AWS",
6+
"reason": null,
7+
"repositoryURL": "https://github.com/nodes-vapor/aws.git",
8+
"version": "0.1.0"
9+
},
10+
{
11+
"package": "CCurl",
12+
"reason": null,
13+
"repositoryURL": "https://github.com/boostcode/CCurl.git",
14+
"version": "0.2.4"
15+
},
16+
{
17+
"package": "CLibreSSL",
18+
"reason": null,
19+
"repositoryURL": "https://github.com/vapor/clibressl.git",
20+
"version": "1.0.0"
21+
},
22+
{
23+
"package": "CPostgreSQL",
24+
"reason": null,
25+
"repositoryURL": "https://github.com/vapor/cpostgresql.git",
26+
"version": "1.0.0"
27+
},
28+
{
29+
"package": "Console",
30+
"reason": null,
31+
"repositoryURL": "https://github.com/vapor/console.git",
32+
"version": "1.0.2"
33+
},
34+
{
35+
"package": "Core",
36+
"reason": null,
37+
"repositoryURL": "https://github.com/vapor/core.git",
38+
"version": "1.1.2"
39+
},
40+
{
41+
"package": "Crypto",
42+
"reason": null,
43+
"repositoryURL": "https://github.com/vapor/crypto.git",
44+
"version": "1.1.0"
45+
},
46+
{
47+
"package": "DataURI",
48+
"reason": null,
49+
"repositoryURL": "https://github.com/nodes-vapor/data-uri.git",
50+
"version": "0.1.1"
51+
},
52+
{
53+
"package": "Engine",
54+
"reason": null,
55+
"repositoryURL": "https://github.com/vapor/engine.git",
56+
"version": "1.3.12"
57+
},
58+
{
59+
"package": "Fluent",
60+
"reason": null,
61+
"repositoryURL": "https://github.com/vapor/fluent.git",
62+
"version": "1.4.3"
63+
},
64+
{
65+
"package": "FluentPostgreSQL",
66+
"reason": null,
67+
"repositoryURL": "https://github.com/vapor-community/postgresql-driver.git",
68+
"version": "1.1.0"
69+
},
70+
{
71+
"package": "JSON",
72+
"reason": null,
73+
"repositoryURL": "https://github.com/vapor/json.git",
74+
"version": "1.0.6"
75+
},
76+
{
77+
"package": "JWT",
78+
"reason": null,
79+
"repositoryURL": "https://github.com/vapor/jwt.git",
80+
"version": "1.0.1"
81+
},
82+
{
83+
"package": "Jay",
84+
"reason": null,
85+
"repositoryURL": "https://github.com/DanToml/Jay.git",
86+
"version": "1.0.1"
87+
},
88+
{
89+
"package": "Leaf",
90+
"reason": null,
91+
"repositoryURL": "https://github.com/vapor/leaf.git",
92+
"version": "1.0.7"
93+
},
94+
{
95+
"package": "MimeLib",
96+
"reason": null,
97+
"repositoryURL": "https://github.com/manGoweb/MimeLib.git",
98+
"version": "1.0.0"
99+
},
100+
{
101+
"package": "Multipart",
102+
"reason": null,
103+
"repositoryURL": "https://github.com/vapor/multipart.git",
104+
"version": "1.0.3"
105+
},
106+
{
107+
"package": "Node",
108+
"reason": null,
109+
"repositoryURL": "https://github.com/vapor/node.git",
110+
"version": "1.0.1"
111+
},
112+
{
113+
"package": "PathIndexable",
114+
"reason": null,
115+
"repositoryURL": "https://github.com/vapor/path-indexable.git",
116+
"version": "1.0.0"
117+
},
118+
{
119+
"package": "Polymorphic",
120+
"reason": null,
121+
"repositoryURL": "https://github.com/vapor/polymorphic.git",
122+
"version": "1.0.1"
123+
},
124+
{
125+
"package": "PostgreSQL",
126+
"reason": null,
127+
"repositoryURL": "https://github.com/vapor/postgresql.git",
128+
"version": "1.1.0"
129+
},
130+
{
131+
"package": "Routing",
132+
"reason": null,
133+
"repositoryURL": "https://github.com/vapor/routing.git",
134+
"version": "1.1.0"
135+
},
136+
{
137+
"package": "Socks",
138+
"reason": null,
139+
"repositoryURL": "https://github.com/vapor/socks.git",
140+
"version": "1.2.7"
141+
},
142+
{
143+
"package": "Storage",
144+
"reason": null,
145+
"repositoryURL": "https://github.com/nodes-vapor/storage.git",
146+
"version": "0.3.8"
147+
},
148+
{
149+
"package": "SwiftString",
150+
"reason": null,
151+
"repositoryURL": "https://github.com/matthijs2704/SwiftString.git",
152+
"version": "1.0.5"
153+
},
154+
{
155+
"package": "TLS",
156+
"reason": null,
157+
"repositoryURL": "https://github.com/vapor/tls.git",
158+
"version": "1.1.2"
159+
},
160+
{
161+
"package": "Turnstile",
162+
"reason": null,
163+
"repositoryURL": "https://github.com/stormpath/Turnstile.git",
164+
"version": "1.0.6"
165+
},
166+
{
167+
"package": "Vapor",
168+
"reason": null,
169+
"repositoryURL": "https://github.com/vapor/vapor.git",
170+
"version": "1.5.15"
171+
},
172+
{
173+
"package": "VaporAPNS",
174+
"reason": null,
175+
"repositoryURL": "https://github.com/matthijs2704/vapor-apns.git",
176+
"version": "1.2.2"
177+
}
178+
],
179+
"version": 1
180+
}

Diff for: ‎Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let package = Package(
77
.Package(url: "https://github.com/vapor/fluent.git", majorVersion: 1),
88
.Package(url: "https://github.com/vapor-community/postgresql-driver.git", majorVersion: 1, minor: 1),
99
.Package(url: "https://github.com/nodes-vapor/storage.git", majorVersion: 0, minor: 3),
10-
.Package(url: "https://github.com/matthijs2704/vapor-apns.git", majorVersion: 1, minor: 1),
10+
.Package(url: "https://github.com/matthijs2704/vapor-apns.git", majorVersion: 1, minor: 2),
1111
],
1212
exclude: [
1313
"Config",

0 commit comments

Comments
 (0)