Skip to content

Commit

Permalink
Merge branch 'feature/s3' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
gee1k committed Aug 14, 2020
2 parents f2212d2 + 3fa4e00 commit c102fb4
Show file tree
Hide file tree
Showing 28 changed files with 462 additions and 631 deletions.
107 changes: 59 additions & 48 deletions uPic.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

70 changes: 70 additions & 0 deletions uPic.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"object": {
"pins": [
{
"package": "AWSSDKSwift",
"repositoryURL": "https://github.com/swift-aws/aws-sdk-swift.git",
"state": {
"branch": null,
"revision": "6345f0a548de02eac0ba5dca217e1857d0a77467",
"version": "4.7.0"
}
},
{
"package": "AWSSDKSwiftCore",
"repositoryURL": "https://github.com/swift-aws/aws-sdk-swift-core.git",
"state": {
"branch": null,
"revision": "2a36809260bcfc38222b85808978c719199612af",
"version": "4.6.0"
}
},
{
"package": "HypertextApplicationLanguage",
"repositoryURL": "https://github.com/swift-aws/HypertextApplicationLanguage.git",
"state": {
"branch": null,
"revision": "aa2c9141d491682f17b2310aed17b9adfc006256",
"version": "1.1.1"
}
},
{
"package": "INIParser",
"repositoryURL": "https://github.com/swift-aws/Perfect-INIParser.git",
"state": {
"branch": null,
"revision": "42de0efc7a01105e19b80d533d3d282a98277f6c",
"version": "3.0.3"
}
},
{
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"state": {
"branch": null,
"revision": "acf5465b5e7fb9aeda54a34d16fb44c31a399715",
"version": "2.20.2"
}
},
{
"package": "swift-nio-ssl",
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
"state": {
"branch": null,
"revision": "8a137b72a9339f295bc8bb95cd2fafe207f1df0d",
"version": "2.9.0"
}
},
{
"package": "swift-nio-transport-services",
"repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
"state": {
"branch": null,
"revision": "d40a5e34e5b35f4f961cb34aeb2e0a02f42a945f",
"version": "1.8.0"
}
}
]
},
"version": 1
}
56 changes: 56 additions & 0 deletions uPic/Assets.xcassets/hosts/host_icon_s3.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"images" : [
{
"filename" : "amazon-light.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "amazon-dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 0 additions & 72 deletions uPic/Models/Amazon_S3/AmazonS3HostConfig.swift

This file was deleted.

128 changes: 0 additions & 128 deletions uPic/Models/Amazon_S3/AmazonS3Uploader.swift

This file was deleted.

62 changes: 0 additions & 62 deletions uPic/Models/Amazon_S3/AmazonS3Util.swift

This file was deleted.

Loading

0 comments on commit c102fb4

Please sign in to comment.