Skip to content

Commit

Permalink
Update Swift to 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
a2 committed May 15, 2017
1 parent f341917 commit babef6c
Show file tree
Hide file tree
Showing 4 changed files with 186 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.1
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Based on instructions from
# https://gist.github.com/alexaubry/bea6f9b626e71b48ae6065664748bc97
# Based on instructions from https://git.io/v9FmJ

FROM aleksaubry/swift-docker:xenial-3.0.1
FROM aleksaubry/swift-apns:3.1.0

ADD ./ /app
WORKDIR /app
Expand All @@ -11,11 +10,11 @@ RUN apt-get update
RUN apt-get install -y libpq-dev

# Build Swift
RUN swift build --config release
RUN swift build -c release

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

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

RUN useradd -m myuser
USER myuser
Expand Down
180 changes: 180 additions & 0 deletions Package.pins
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
{
"autoPin": true,
"pins": [
{
"package": "AWS",
"reason": null,
"repositoryURL": "https://github.com/nodes-vapor/aws.git",
"version": "0.1.0"
},
{
"package": "CCurl",
"reason": null,
"repositoryURL": "https://github.com/boostcode/CCurl.git",
"version": "0.2.4"
},
{
"package": "CLibreSSL",
"reason": null,
"repositoryURL": "https://github.com/vapor/clibressl.git",
"version": "1.0.0"
},
{
"package": "CPostgreSQL",
"reason": null,
"repositoryURL": "https://github.com/vapor/cpostgresql.git",
"version": "1.0.0"
},
{
"package": "Console",
"reason": null,
"repositoryURL": "https://github.com/vapor/console.git",
"version": "1.0.2"
},
{
"package": "Core",
"reason": null,
"repositoryURL": "https://github.com/vapor/core.git",
"version": "1.1.2"
},
{
"package": "Crypto",
"reason": null,
"repositoryURL": "https://github.com/vapor/crypto.git",
"version": "1.1.0"
},
{
"package": "DataURI",
"reason": null,
"repositoryURL": "https://github.com/nodes-vapor/data-uri.git",
"version": "0.1.1"
},
{
"package": "Engine",
"reason": null,
"repositoryURL": "https://github.com/vapor/engine.git",
"version": "1.3.12"
},
{
"package": "Fluent",
"reason": null,
"repositoryURL": "https://github.com/vapor/fluent.git",
"version": "1.4.3"
},
{
"package": "FluentPostgreSQL",
"reason": null,
"repositoryURL": "https://github.com/vapor-community/postgresql-driver.git",
"version": "1.1.0"
},
{
"package": "JSON",
"reason": null,
"repositoryURL": "https://github.com/vapor/json.git",
"version": "1.0.6"
},
{
"package": "JWT",
"reason": null,
"repositoryURL": "https://github.com/vapor/jwt.git",
"version": "1.0.1"
},
{
"package": "Jay",
"reason": null,
"repositoryURL": "https://github.com/DanToml/Jay.git",
"version": "1.0.1"
},
{
"package": "Leaf",
"reason": null,
"repositoryURL": "https://github.com/vapor/leaf.git",
"version": "1.0.7"
},
{
"package": "MimeLib",
"reason": null,
"repositoryURL": "https://github.com/manGoweb/MimeLib.git",
"version": "1.0.0"
},
{
"package": "Multipart",
"reason": null,
"repositoryURL": "https://github.com/vapor/multipart.git",
"version": "1.0.3"
},
{
"package": "Node",
"reason": null,
"repositoryURL": "https://github.com/vapor/node.git",
"version": "1.0.1"
},
{
"package": "PathIndexable",
"reason": null,
"repositoryURL": "https://github.com/vapor/path-indexable.git",
"version": "1.0.0"
},
{
"package": "Polymorphic",
"reason": null,
"repositoryURL": "https://github.com/vapor/polymorphic.git",
"version": "1.0.1"
},
{
"package": "PostgreSQL",
"reason": null,
"repositoryURL": "https://github.com/vapor/postgresql.git",
"version": "1.1.0"
},
{
"package": "Routing",
"reason": null,
"repositoryURL": "https://github.com/vapor/routing.git",
"version": "1.1.0"
},
{
"package": "Socks",
"reason": null,
"repositoryURL": "https://github.com/vapor/socks.git",
"version": "1.2.7"
},
{
"package": "Storage",
"reason": null,
"repositoryURL": "https://github.com/nodes-vapor/storage.git",
"version": "0.3.8"
},
{
"package": "SwiftString",
"reason": null,
"repositoryURL": "https://github.com/matthijs2704/SwiftString.git",
"version": "1.0.5"
},
{
"package": "TLS",
"reason": null,
"repositoryURL": "https://github.com/vapor/tls.git",
"version": "1.1.2"
},
{
"package": "Turnstile",
"reason": null,
"repositoryURL": "https://github.com/stormpath/Turnstile.git",
"version": "1.0.6"
},
{
"package": "Vapor",
"reason": null,
"repositoryURL": "https://github.com/vapor/vapor.git",
"version": "1.5.15"
},
{
"package": "VaporAPNS",
"reason": null,
"repositoryURL": "https://github.com/matthijs2704/vapor-apns.git",
"version": "1.2.2"
}
],
"version": 1
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let package = Package(
.Package(url: "https://github.com/vapor/fluent.git", majorVersion: 1),
.Package(url: "https://github.com/vapor-community/postgresql-driver.git", majorVersion: 1, minor: 1),
.Package(url: "https://github.com/nodes-vapor/storage.git", majorVersion: 0, minor: 3),
.Package(url: "https://github.com/matthijs2704/vapor-apns.git", majorVersion: 1, minor: 1),
.Package(url: "https://github.com/matthijs2704/vapor-apns.git", majorVersion: 1, minor: 2),
],
exclude: [
"Config",
Expand Down

0 comments on commit babef6c

Please sign in to comment.