Skip to content

Commit

Permalink
Updating License
Browse files Browse the repository at this point in the history
  • Loading branch information
mattt committed May 2, 2015
1 parent 11ff3d8 commit 583742a
Show file tree
Hide file tree
Showing 54 changed files with 71 additions and 124 deletions.
3 changes: 1 addition & 2 deletions AFNetworking/AFHTTPRequestOperation.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPRequestOperation.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFHTTPRequestOperation.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPRequestOperation.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFHTTPRequestOperationManager.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPRequestOperationManager.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFHTTPRequestOperationManager.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPRequestOperationManager.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFHTTPSessionManager.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPSessionManager.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFHTTPSessionManager.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPSessionManager.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFNetworkReachabilityManager.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFNetworkReachabilityManager.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFNetworkReachabilityManager.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFNetworkReachabilityManager.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFSecurityPolicy.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFSecurityPolicy.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 2 additions & 3 deletions AFNetworking/AFSecurityPolicy.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFSecurityPolicy.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -248,7 +247,7 @@ - (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust
} else if (!AFServerTrustIsValid(serverTrust) && !self.allowInvalidCertificates) {
return NO;
}

NSArray *serverCertificates = AFCertificateTrustChainForServerTrust(serverTrust);
switch (self.SSLPinningMode) {
case AFSSLPinningModeNone:
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFURLConnectionOperation.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFURLConnectionOperation.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFURLConnectionOperation.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFURLConnectionOperation.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
7 changes: 3 additions & 4 deletions AFNetworking/AFURLRequestSerialization.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFURLRequestSerialization.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -118,10 +117,10 @@ typedef NS_ENUM(NSUInteger, AFHTTPRequestQueryStringSerializationStyle) {

/**
Default HTTP header field values to be applied to serialized requests. By default, these include the following:
- `Accept-Language` with the contents of `NSLocale +preferredLanguages`
- `User-Agent` with the contents of various bundle identifiers and OS designations
@discussion To add or remove default request headers, use `setValue:forHTTPHeaderField:`.
*/
@property (readonly, nonatomic, strong) NSDictionary *HTTPRequestHeaders;
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFURLRequestSerialization.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFURLRequestSerialization.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFURLResponseSerialization.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFURLResponseSerialization.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 2 additions & 3 deletions AFNetworking/AFURLResponseSerialization.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFURLResponseSerialization.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -535,7 +534,7 @@ - (id)copyWithZone:(NSZone *)zone {
if (image.images) {
return image;
}

return [[UIImage alloc] initWithCGImage:[image CGImage] scale:scale orientation:image.imageOrientation];
}

Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFURLSessionManager.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFURLSessionManager.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions AFNetworking/AFURLSessionManager.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFURLSessionManager.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com/)
Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFHTTPClientTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPClientTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFHTTPRequestOperationTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPRequestOperationTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFImageRequestOperationTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFImageRequestOperationTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFJSONRequestOperationTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFJSONRequestOperationTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFMockURLProtocol.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFMockURLProtocol.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFMockURLProtocol.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFMockURLProtocol.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFNetworkingTests.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFNetworkingTests.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFNetworkingTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFNetworkingTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/1.0 Tests/AFURLConnectionOperationTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFJSONRequestOperationTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/AFHTTPRequestOperationTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPRequestOperationTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/AFHTTPRequestSerializationTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPSerializationTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/AFHTTPResponseSerializationTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPResponseSerializationTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/AFHTTPSessionManagerTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFHTTPSessionManagerTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/AFJSONSerializationTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFJSONSerializationTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/AFNetworkActivityManagerTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFNetworkActivityManagerTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
27 changes: 13 additions & 14 deletions Tests/Tests/AFNetworkReachabilityManagerTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFNetworkReachabilityManagerTests.h
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -34,10 +33,10 @@ @implementation AFNetworkReachabilityManagerTests

- (void)setUp {
[super setUp];

//both of these manager objects should always be reachable when the tests are run
self.domainReachability = [AFNetworkReachabilityManager managerForDomain:@"localhost"];

//don't use the shared manager because it retains state between tests
//but recreate it each time in the same way that the shared manager is created
struct sockaddr_in address;
Expand All @@ -51,7 +50,7 @@ - (void)tearDown
{
[self.addressReachability stopMonitoring];
[self.domainReachability stopMonitoring];

[super tearDown];
}

Expand All @@ -74,17 +73,17 @@ - (void)verifyReachabilityNotificationGetsPostedWithManager:(AFNetworkReachabili
status = [note.userInfo[AFNetworkingReachabilityNotificationStatusItem] integerValue];
BOOL reachable = (status == AFNetworkReachabilityStatusReachableViaWiFi
|| status == AFNetworkReachabilityStatusReachableViaWWAN);

XCTAssert(reachable,
@"Expected network to be reachable but got '%@'",
AFStringFromNetworkReachabilityStatus(status));
XCTAssertEqual(reachable, manager.isReachable, @"Expected status to match 'isReachable'");

return YES;
}];

[manager startMonitoring];

[self waitForExpectationsWithTimeout:5 handler:nil];
}

Expand All @@ -99,20 +98,20 @@ - (void)testDomainReachabilityNotification {
- (void)verifyReachabilityStatusBlockGetsCalledWithManager:(AFNetworkReachabilityManager *)manager
{
XCTestExpectation *expectation = [self expectationWithDescription:@"reachability status change block gets called"];

typeof(manager) __weak weakManager = manager;
[manager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
BOOL reachable = (status == AFNetworkReachabilityStatusReachableViaWiFi
|| status == AFNetworkReachabilityStatusReachableViaWWAN);

XCTAssert(reachable, @"Expected network to be reachable but got '%@'", AFStringFromNetworkReachabilityStatus(status));
XCTAssertEqual(reachable, weakManager.isReachable, @"Expected status to match 'isReachable'");

[expectation fulfill];
}];

[manager startMonitoring];

[self waitForExpectationsWithTimeout:5 handler:^(NSError *error) {
[manager setReachabilityStatusChangeBlock:nil];
}];
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/AFPropertyListResponseSerializerTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFPropertyListResponseSerializerTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions Tests/Tests/AFSecurityPolicyTests.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// AFSecurityPolicyTests.m
//
// Copyright (c) 2013-2015 AFNetworking (http://afnetworking.com)
// Copyright (c) 2011–2015 Alamofire Software Foundation (http://alamofire.org/)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 583742a

Please sign in to comment.