update to Swift 2.3

MLSDev · Sep 10, 2016 · 8ba0b2e · 8ba0b2e
1 parent 2f1fb43
commit 8ba0b2e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.2.0](https://github.com/MLSDev/TRON/releases/tag/1.2.0)
+
+Support for building with Swift 2.3 along with Swift 2.2.
+
 ## [1.1.0](https://github.com/MLSDev/TRON/releases/tag/1.1.0)
 
 ### Added

diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "swift2.3"
-github "SwiftyJSON/SwiftyJSON"
-github "ReactiveX/RxSwift"
+github "Alamofire/Alamofire" ~> 3.5.0
+github "SwiftyJSON/SwiftyJSON" ~> 2.3
+github "ReactiveX/RxSwift" ~> 2.6.0
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/SwiftyJSON b/Carthage/Checkouts/SwiftyJSON
diff --git a/Package.swift b/Package.swift
@@ -25,7 +25,7 @@ import PackageDescription
 let package = Package(
   name: "TRON",
   dependencies: [
-    .Package(url: "https://github.com/Alamofire/Alamofire.git", versions: Version(3, 1, 5)..<Version(4, 0, 0)),
+    .Package(url: "https://github.com/Alamofire/Alamofire.git", versions: Version(3, 5, 0)..<Version(4, 0, 0)),
     .Package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", versions: Version(2, 3, 1)..<Version(3, 0, 0))
   ]
 )
diff --git a/TRON.podspec b/TRON.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'TRON'
-  s.version  = '1.1.0'
+  s.version  = '1.2.0'
   s.license  = 'MIT'
   s.summary  = 'Lightweight network abstraction layer, written on top of Alamofire'
   s.homepage = 'https://github.com/MLSDev/TRON'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.10'
   s.watchos.deployment_target = '2.0'
   s.frameworks = 'Foundation'
-  s.dependency 'Alamofire' , '~> 3.4'
+  s.dependency 'Alamofire' , '~> 3.5'
 
   s.subspec 'Core' do |core|
       core.ios.frameworks = 'UIKit'
+56 −21		.travis.yml
+1 −1		Alamofire.podspec
+104 −50		Alamofire.xcodeproj/project.pbxproj
+80 −0		Alamofire.xcodeproj/xcshareddata/xcschemes/Cleanup Whitespace.xcscheme
+56 −1		CHANGELOG.md
+16 −3		Example/iOS Example.xcodeproj/project.pbxproj
+15 −6		README.md
+19 −18		Source/Alamofire.swift
+6 −6		Source/Download.swift
+1 −1		Source/Info-tvOS.plist
+1 −1		Source/Info.plist
+44 −33		Source/Manager.swift
+7 −7		Source/MultipartFormData.swift
+1 −1		Source/NetworkReachabilityManager.swift
+1 −1		Source/Notifications.swift
+5 −5		Source/ParameterEncoding.swift
+8 −8		Source/Request.swift
+1 −1		Source/Response.swift
+10 −10		Source/ResponseSerialization.swift
+3 −3		Source/Result.swift
+18 −18		Source/ServerTrustPolicy.swift
+1 −1		Source/Stream.swift
+4 −4		Source/Timeline.swift
+11 −11		Source/Upload.swift
+3 −3		Source/Validation.swift
+1 −1		Tests/CacheTests.swift
+47 −0		Tests/ManagerTests.swift
+2 −2		Tests/MultipartFormDataTests.swift
+3 −3		Tests/ParameterEncodingTests.swift
+7 −13		Tests/RequestTests.swift
+ −		Tests/Resources/Certificates/disig.sk/intermediate-ca-disig.cer
+ −		Tests/Resources/Certificates/disig.sk/root-ca-disig.cer
+ −		Tests/Resources/Certificates/disig.sk/testssl-expire.disig.sk.cer
+ −		Tests/Resources/Certificates/expired.badssl.com/expired.badssl.com-intermediate-ca-1.cer
+ −		Tests/Resources/Certificates/expired.badssl.com/expired.badssl.com-intermediate-ca-2.cer
+ −		Tests/Resources/Certificates/expired.badssl.com/expired.badssl.com-leaf.cer
+ −		Tests/Resources/Certificates/expired.badssl.com/expired.badssl.com-root-ca.cer
+4 −4		Tests/ServerTrustPolicyTests.swift
+1 −1		Tests/SessionDelegateTests.swift
+22 −12		Tests/TLSEvaluationTests.swift
+6 −6		.travis.yml
+162 −90		Nimble.xcodeproj/project.pbxproj
+1 −1		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+4 −4		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme
+1 −1		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+5 −5		README.md
+9 −1		Sources/Nimble/FailureMessage.swift
+9 −2		Sources/Nimble/Matchers/HaveCount.swift
+46 −0		Sources/Nimble/Utils/Stringers.swift
+12 −9		Tests/Nimble/Matchers/HaveCountTest.swift
+10 −10		Tests/Nimble/objc/ObjCHaveCount.m
+1 −1		circle.yml
+14 −14		test
+26 −4		README.md
+11 −9		Source/SwiftyJSON.swift
+1 −1		SwiftyJSON.podspec
+6 −2		SwiftyJSON.xcodeproj/project.pbxproj
+2 −2		Tests/BaseTests.swift
+10 −10		Tests/SequenceTypeTests.swift