Skip to content

Commit

Permalink
Merge pull request #415 from Vkt0r/1.4.7
Browse files Browse the repository at this point in the history
Release 1.4.7
  • Loading branch information
Vkt0r authored Jun 10, 2019
2 parents 38470f0 + de11039 commit 8b5afb4
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 16 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ All notable changes to this project will be documented in this file. Changes not
# [Unreleased]

* Nothing yet.

# [1.4.7]

## Added
- A new `CHANGELOG.md` to keep track of changes in the project. ([#385](https://github.com/httpswift/swifter/pull/385)) by [@Vkt0r](https://github.com/Vkt0r)
- Added [Danger](https://danger.systems/ruby/) and Swiftlint to the project. ([#398](https://github.com/httpswift/swifter/pull/398)) by [@Vkt0r](https://github.com/Vkt0r)
Expand All @@ -43,7 +47,7 @@ All notable changes to this project will be documented in this file. Changes not
- Include the `CHANGELOG.md` and `README.md` in the Xcode-Project for easy access / changes.

## Removed
- Dropped macOS 10.9 support [#404](https://github.com/httpswift/swifter/pull/404)), [#408](https://github.com/httpswift/swifter/pull/408)) by [@mazyod](https://github.com/mazyod), [@Vkt0r](https://github.com/Vkt0r)
- Dropped macOS 10.9 support ([#404](https://github.com/httpswift/swifter/pull/404), [#408](https://github.com/httpswift/swifter/pull/408)) by [@mazyod](https://github.com/mazyod), [@Vkt0r](https://github.com/Vkt0r)

# [1.4.6]
## Added
Expand All @@ -63,3 +67,4 @@ All notable changes to this project will be documented in this file. Changes not

[Unreleased]: https://github.com/httpswift/swifter/compare/1.4.6...HEAD
[1.4.6]: https://github.com/httpswift/swifter/compare/1.4.5...1.4.6
[1.4.7]: https://github.com/httpswift/swifter/compare/1.4.6...1.4.7
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ server.start()
```ruby
use_frameworks!

pod 'Swifter', '~> 1.4.6'
pod 'Swifter', '~> 1.4.7'
```

### Carthage? Also yes.
```
github "httpswift/swifter" ~> 1.4.6
github "httpswift/swifter" ~> 1.4.7
```

### Swift Package Manager.
Expand All @@ -87,7 +87,7 @@ import PackageDescription
let package = Package(
name: "MyServer",
dependencies: [
.package(url: "https://github.com/httpswift/swifter.git", .upToNextMajor(from: "1.4.6"))
.package(url: "https://github.com/httpswift/swifter.git", .upToNextMajor(from: "1.4.7"))
]
)
```
Expand Down
4 changes: 2 additions & 2 deletions Swifter.podspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Pod::Spec.new do |s|

s.name = "Swifter"
s.version = "1.4.6"
s.version = "1.4.7"
s.summary = "Tiny http server engine written in Swift programming language."
s.homepage = "https://github.com/glock45/swifter"
s.license = { :type => 'Copyright', :file => 'LICENSE' }
s.author = { "Damian Kołakowski" => "[email protected]" }
s.ios.deployment_target = "8.0"
s.osx.deployment_target = "10.10"
s.tvos.deployment_target = "9.0"
s.source = { :git => "https://github.com/httpswift/swifter.git", :tag => "1.4.6" }
s.source = { :git => "https://github.com/httpswift/swifter.git", :tag => "1.4.7" }
s.source_files = 'XCode/Sources/*.{swift}'

end
2 changes: 1 addition & 1 deletion XCode/Sources/HttpServer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Foundation

public class HttpServer: HttpServerIO {

public static let VERSION = "1.4.6"
public static let VERSION = "1.4.7"

private let router = HttpRouter()

Expand Down
4 changes: 2 additions & 2 deletions XCode/Swifter.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1.4.6;
CURRENT_PROJECT_VERSION = 1.4.7;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down Expand Up @@ -1332,7 +1332,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 1.4.6;
CURRENT_PROJECT_VERSION = 1.4.7;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down
4 changes: 2 additions & 2 deletions XCode/SwifterMac/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<string>1.4.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 Damian Kołakowski. All rights reserved.</string>
<string>Copyright © 2019 Damian Kołakowski. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion XCode/SwifterSampleiOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<string>1.4.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions XCode/SwifteriOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<string>1.4.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 Damian Kołakowski. All rights reserved.</string>
<string>Copyright © 2019 Damian Kołakowski. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions XCode/SwiftertvOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.4.6</string>
<string>1.4.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 Damian Kołakowski. All rights reserved.</string>
<string>Copyright © 2019 Damian Kołakowski. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down

0 comments on commit 8b5afb4

Please sign in to comment.