Skip to content

Commit

Permalink
Merge pull request #50 from noppoMan/swift4
Browse files Browse the repository at this point in the history
Swift4
  • Loading branch information
noppoMan authored Oct 6, 2017
2 parents 147b2ac + d8adffc commit 302f83b
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ os:
language: generic
sudo: required
dist: trusty
osx_image: xcode8.3
osx_image: xcode9

addons:
hosts:
Expand Down
42 changes: 0 additions & 42 deletions Package.pins

This file was deleted.

61 changes: 61 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"object": {
"pins": [
{
"package": "AWSSDKSwiftCore",
"repositoryURL": "https://github.com/noppoMan/aws-sdk-swift-core.git",
"state": {
"branch": null,
"revision": "14b371ebc51951556540aaaac41b1c01a95990fe",
"version": "0.2.5"
}
},
{
"package": "CHTTPParser",
"repositoryURL": "https://github.com/Zewo/CHTTPParser.git",
"state": {
"branch": null,
"revision": "88306ab33bb316b2eedd39c90f4be8f4ebf65a11",
"version": "0.14.0"
}
},
{
"package": "CLibreSSL",
"repositoryURL": "https://github.com/vapor/clibressl.git",
"state": {
"branch": null,
"revision": "23ddb296981d17a8ee6c7418742a40cad5d2f9d0",
"version": "1.0.0"
}
},
{
"package": "HypertextApplicationLanguage",
"repositoryURL": "https://github.com/noppoMan/HypertextApplicationLanguage.git",
"state": {
"branch": null,
"revision": "e6216c13fd510e31e70e6f409936f1a656db1f33",
"version": "1.0.1"
}
},
{
"package": "Prorsum",
"repositoryURL": "https://github.com/noppoMan/Prorsum.git",
"state": {
"branch": null,
"revision": "6f2558056fb887a84331c5da7d6ac4211bc16187",
"version": "0.1.16"
}
},
{
"package": "SwiftyJSON",
"repositoryURL": "https://github.com/IBM-Swift/SwiftyJSON.git",
"state": {
"branch": null,
"revision": "1190845cf7d25a5c8ea7653fe03dcdd39a082056",
"version": "16.0.2"
}
}
]
},
"version": 1
}
19 changes: 19 additions & 0 deletions Package@swift-4.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// swift-tools-version:4.0
import PackageDescription

let package = Package(
name: "AWSSDKSwift",
products: [
.library(name: "AWSSDKSwift", targets: ["AWSSDKSwift"]),
.executable(name: "aws-sdk-swift-codegen", targets: ["CodeGenerator"])
],
dependencies: [
.package(url: "https://github.com/noppoMan/aws-sdk-swift-core.git", .upToNextMajor(from: "0.2.5")),
.package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", .upToNextMajor(from: "16.0.0"))
],
targets: [
.target(name: "CodeGenerator", dependencies: ["AWSSDKSwiftCore", "SwiftyJSON"]),
.target(name: "AWSSDKSwift", dependencies: ["AWSSDKSwiftCore", "SwiftyJSON"]),
.testTarget(name: "AWSSDKSwiftTests", dependencies: ["AWSSDKSwift"])
]
)
2 changes: 1 addition & 1 deletion scripts/install-swift.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

VERSION="3.1"
VERSION="4.0"

# Determine OS
UNAME=`uname`;
Expand Down

0 comments on commit 302f83b

Please sign in to comment.