Merge pull request #25 from SomaticLabs/swift4

Swift4

Author: ajaykarpur

Cartfile

@@ -1,3 +1,3 @@
-github "SomaticLabs/SwiftyBluetooth" ~> 0.3
-github "Alamofire/Alamofire" ~> 4.0
-github "SwiftyJSON/SwiftyJSON" ~> 3.1
+github "SomaticLabs/SwiftyBluetooth" ~> 1.0
+github "Alamofire/Alamofire" ~> 4.5
+github "SwiftyJSON/SwiftyJSON" ~> 4.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "4.5.0"
-github "SomaticLabs/SwiftyBluetooth" "0.3.4"
-github "SwiftyJSON/SwiftyJSON" "3.1.4"
+github "Alamofire/Alamofire" "4.5.1"
+github "SomaticLabs/SwiftyBluetooth" "1.0.0"
+github "SwiftyJSON/SwiftyJSON" "4.0.0"

Carthage/Checkouts/Alamofire

@@ -0,0 +1,33 @@
+### What did you do?
+
+Please replace this with what you did.
+
+### What did you expect to happen?
+
+Please replace this with what you expected to happen.
+
+### What actually happened instead?
+
+Please replace this with what happened instead.
+
+### Environment
+
+List the software versions you're using:
+
+ - SwiftyJSON: *?.?.?*
+ - Xcode Version: *?.? (????)* (Open Xcode; In menubar: Xcode > About Xcode)
+ - Swift Version: *?.?* (Open Xcode Preferences; Components > Toolchains. If none, use `Xcode Default`.)
+
+Please also mention which package manager you used and its version. Delete the
+other package managers in this list:
+
+ - Cocoapods: *?.?.?* (Use `pod --version` in Terminal)
+ - Carthage: *?.?* (Use `carthage version` in Terminal)
+ - Swift Package Manager *?.?.? (swiftpm-???)* (Use `swift build --version` in Terminal)
+
+### Project that demonstrates the issue
+
+Please link to a project we can download that reproduces the issue. Feel free
+to delete this section if it's not relevant to the issue (eg - feature request).
+
+The project should be [short, self-contained, and correct example](http://sscce.org/).

Carthage/Checkouts/SwiftyBluetooth

@@ -0,0 +1,13 @@
+The PR should summarize what was changed and why. Here are some questions to
+help you if you're not sure:
+
+ - What behavior was changed?
+ - What code was refactored / updated to support this change?
+ - What issues are related to this PR? Or why was this change introduced?
+
+Checklist - While not every PR needs it, new features should consider this list:
+
+ - [ ] Does this have tests?
+ - [ ] Does this have documentation?
+ - [ ] Does this break the public API (Requires major version bump)?
+ - [ ] Is this a new feature (Requires minor version bump)?

Carthage/Checkouts/SwiftyJSON/.github/ISSUE_TEMPLATE

@@ -0,0 +1,2 @@
+swift:
+    config_file: .swiftlint.yml

Carthage/Checkouts/SwiftyJSON/.github/PULL_REQUEST_TEMPLATE

@@ -0,0 +1,10 @@
+disabled_rules:
+  - force_cast
+  - force_try
+  - variable_name
+  - type_name
+  - file_length
+  - line_length
+  - type_body_length
+  - cyclomatic_complexity
+  - function_body_length

Carthage/Checkouts/SwiftyJSON/.hound.yml

@@ -1,27 +1,8 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode9
 xcode_sdk: iphonesimulator10.0
-env:
-  global:
-  - FRAMEWORK_NAME=SwiftyJSON
-before_install:
-- rvm get head
-- brew update
-- brew outdated carthage || brew upgrade carthage
-before_deploy:
-- carthage build --no-skip-current
-- carthage archive $FRAMEWORK_NAME
 script:
 - set -o pipefail
 - travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON iOS" -destination "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty
-- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON OSX" build-for-testing test | xcpretty
+- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON macOS" build-for-testing test | xcpretty
 - travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON tvOS" -destination "platform=tvOS Simulator,name=Apple TV 1080p" build-for-testing test | xcpretty
-deploy:
-  provider: releases
-  api_key:
-    secure: MufQRIzcHPU5fn9gyXl7kDGaLihN6zGABx9UWqNtkwq0AxV0aYNWys11nrKDIgoZFR+MbQHMoodpZK03yDdCLG03ncnOr3aytLOpI0imuDFWx16sieiVoYmnP5bfNFTN0qqXdfBy0OOsx4wO+F5Pwg5y1TgGYnKpXtEfdIU3Om4=
-  file: SwiftyJSON.framework.zip
-  skip_cleanup: true
-  on:
-    repo: SwiftyJSON/SwiftyJSON
-    tags: true

Carthage/Checkouts/SwiftyJSON/.swiftlint.yml

@@ -124,7 +124,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = swiftyjson;
 				TargetAttributes = {
 					A82A1C1819D926B8009A653D = {
@@ -206,14 +206,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -254,14 +260,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;