Browse Source

Updating License

Mattt Thompson 10 years ago
parent
commit
bc6fa4cb73

+ 2 - 1
Example/AppDelegate.swift

@@ -1,6 +1,6 @@
 // AppDelegate.swift
 // AppDelegate.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import UIKit
 import UIKit
 
 
 @UIApplicationMain
 @UIApplicationMain

+ 2 - 1
Example/DetailViewController.swift

@@ -1,6 +1,6 @@
 // DetailViewController.swift
 // DetailViewController.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import UIKit
 import UIKit
 import Alamofire
 import Alamofire
 
 

+ 2 - 1
Example/HTTPBin.swift

@@ -1,6 +1,6 @@
 // MasterViewController.swift
 // MasterViewController.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 
 

+ 2 - 1
Example/MasterViewController.swift

@@ -1,6 +1,6 @@
 // MasterViewController.swift
 // MasterViewController.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import UIKit
 import UIKit
 import Alamofire
 import Alamofire
 
 

+ 1 - 1
LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
+Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 of this software and associated documentation files (the "Software"), to deal

+ 2 - 1
Source/Alamofire.h

@@ -1,6 +1,6 @@
 // Alamofire.h
 // Alamofire.h
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 #import <Foundation/Foundation.h>
 #import <Foundation/Foundation.h>
 
 
 FOUNDATION_EXPORT double AlamofireVersionNumber;
 FOUNDATION_EXPORT double AlamofireVersionNumber;

+ 2 - 1
Source/Alamofire.swift

@@ -1,6 +1,6 @@
 // Alamofire.swift
 // Alamofire.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 
 
 /// Alamofire errors
 /// Alamofire errors

+ 2 - 1
Tests/AuthenticationTests.swift

@@ -1,6 +1,6 @@
 // DownloadTests.swift
 // DownloadTests.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 import XCTest
 import XCTest

+ 2 - 1
Tests/DownloadTests.swift

@@ -1,6 +1,6 @@
 // DownloadTests.swift
 // DownloadTests.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 import XCTest
 import XCTest

+ 2 - 1
Tests/ManagerTests.swift

@@ -1,6 +1,6 @@
 // RequestTests.swift
 // RequestTests.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 import XCTest
 import XCTest

+ 2 - 1
Tests/ParameterEncodingTests.swift

@@ -1,6 +1,6 @@
 // ParameterEncodingTests.swift
 // ParameterEncodingTests.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 import XCTest
 import XCTest

+ 14 - 13
Tests/ResponseTests.swift

@@ -1,6 +1,6 @@
 // ResponseTests.swift
 // ResponseTests.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 import XCTest
 import XCTest
@@ -72,14 +73,14 @@ class AlamofireRedirectResponseTestCase: XCTestCase {
     func testGETRequestRedirectResponse() {
     func testGETRequestRedirectResponse() {
         let URL = "http://google.com"
         let URL = "http://google.com"
         let expectation = expectationWithDescription("\(URL)")
         let expectation = expectationWithDescription("\(URL)")
-        
+
         let delegate: Alamofire.Manager.SessionDelegate = Alamofire.Manager.sharedInstance.delegate
         let delegate: Alamofire.Manager.SessionDelegate = Alamofire.Manager.sharedInstance.delegate
-        
+
         delegate.taskWillPerformHTTPRedirection = { (session: NSURLSession!, task: NSURLSessionTask!, response: NSHTTPURLResponse!, request: NSURLRequest!) in
         delegate.taskWillPerformHTTPRedirection = { (session: NSURLSession!, task: NSURLSessionTask!, response: NSHTTPURLResponse!, request: NSURLRequest!) in
             // Accept the redirect by returning the updated request.
             // Accept the redirect by returning the updated request.
             return request
             return request
         }
         }
-        
+
         Alamofire.request(.GET, URL)
         Alamofire.request(.GET, URL)
             .response { (request, response, data, error) in
             .response { (request, response, data, error) in
                 expectation.fulfill()
                 expectation.fulfill()
@@ -87,29 +88,29 @@ class AlamofireRedirectResponseTestCase: XCTestCase {
                 XCTAssertNotNil(response, "response should not be nil")
                 XCTAssertNotNil(response, "response should not be nil")
                 XCTAssertNotNil(data, "data should not be nil")
                 XCTAssertNotNil(data, "data should not be nil")
                 XCTAssertNil(error, "error should be nil")
                 XCTAssertNil(error, "error should be nil")
-                
+
                 XCTAssertEqual(response!.URL!, NSURL(string: "http://www.google.com/")!, "request should have followed a redirect")
                 XCTAssertEqual(response!.URL!, NSURL(string: "http://www.google.com/")!, "request should have followed a redirect")
         }
         }
-        
+
         waitForExpectationsWithTimeout(10) { (error) in
         waitForExpectationsWithTimeout(10) { (error) in
             XCTAssertNil(error, "\(error)")
             XCTAssertNil(error, "\(error)")
         }
         }
     }
     }
-    
+
     func testGETRequestDisallowRedirectResponse() {
     func testGETRequestDisallowRedirectResponse() {
         let URL = "http://google.com/"
         let URL = "http://google.com/"
         let expectation = expectationWithDescription("\(URL)")
         let expectation = expectationWithDescription("\(URL)")
-        
+
         let delegate: Alamofire.Manager.SessionDelegate = Alamofire.Manager.sharedInstance.delegate
         let delegate: Alamofire.Manager.SessionDelegate = Alamofire.Manager.sharedInstance.delegate
-        
+
         delegate.taskWillPerformHTTPRedirection = { (session: NSURLSession!, task: NSURLSessionTask!, response: NSHTTPURLResponse!, request: NSURLRequest!) in
         delegate.taskWillPerformHTTPRedirection = { (session: NSURLSession!, task: NSURLSessionTask!, response: NSHTTPURLResponse!, request: NSURLRequest!) in
             // Disallow redirects by returning nil.
             // Disallow redirects by returning nil.
             // TODO: NSURLSessionDelegate's URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:
             // TODO: NSURLSessionDelegate's URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:
             // suggests that returning nil should refuse the redirect, but this causes a deadlock/timeout
             // suggests that returning nil should refuse the redirect, but this causes a deadlock/timeout
-            
+
             return NSURLRequest(URL: NSURL(string: URL)!)
             return NSURLRequest(URL: NSURL(string: URL)!)
         }
         }
-        
+
         Alamofire.request(.GET, URL)
         Alamofire.request(.GET, URL)
             .response { (request, response, data, error) in
             .response { (request, response, data, error) in
                 expectation.fulfill()
                 expectation.fulfill()
@@ -117,10 +118,10 @@ class AlamofireRedirectResponseTestCase: XCTestCase {
                 XCTAssertNotNil(response, "response should not be nil")
                 XCTAssertNotNil(response, "response should not be nil")
                 XCTAssertNotNil(data, "data should not be nil")
                 XCTAssertNotNil(data, "data should not be nil")
                 XCTAssertNil(error, "error should be nil")
                 XCTAssertNil(error, "error should be nil")
-                
+
                 XCTAssertEqual(response!.URL!, NSURL(string: URL)!, "request should not have followed a redirect")
                 XCTAssertEqual(response!.URL!, NSURL(string: URL)!, "request should not have followed a redirect")
         }
         }
-        
+
         waitForExpectationsWithTimeout(10) { (error) in
         waitForExpectationsWithTimeout(10) { (error) in
             XCTAssertNil(error, "\(error)")
             XCTAssertNil(error, "\(error)")
         }
         }

+ 2 - 1
Tests/TLSEvaluationTests.swift

@@ -1,6 +1,6 @@
 // DownloadTests.swift
 // DownloadTests.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 import XCTest
 import XCTest

+ 2 - 1
Tests/UploadTests.swift

@@ -1,6 +1,6 @@
 // UploadTests.swift
 // UploadTests.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 import XCTest
 import XCTest

+ 2 - 1
Tests/ValidationTests.swift

@@ -1,6 +1,6 @@
 // DownloadTests.swift
 // DownloadTests.swift
 //
 //
-// Copyright (c) 2014–2015 Alamofire (http://alamofire.org)
+// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/)
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 // THE SOFTWARE.
 
 
+
 import Foundation
 import Foundation
 import Alamofire
 import Alamofire
 import XCTest
 import XCTest